diff --git a/tools/Makefile b/tools/ant-cl/Makefile
similarity index 73%
rename from tools/Makefile
rename to tools/ant-cl/Makefile
index 9c3efc6..b8e4466 100644
--- a/tools/Makefile
+++ b/tools/ant-cl/Makefile
@@ -1,5 +1,5 @@
 #
-# tools/Makefile - Build the Antorcha tool
+# tools/ant-cl/Makefile - Build the Antorcha command-line tool
 #
 # Written 2012 by Werner Almesberger
 # Copyright 2012 Werner Almesberger
@@ -11,19 +11,19 @@
 #
 
 
-MAIN = antorcha
+MAIN = ant-cl
 
-CFLAGS = -g -I../fw -I../../ben-wpan/tools/include \
-	 -I../../ben-wpan/atusb/fw/include \
+CFLAGS = -g -I../../fw -I../../../ben-wpan/tools/include \
+	 -I../../../ben-wpan/atusb/fw/include \
 	 -Wall \
 	 $(if $(NOGFX),, -DGFX $(shell sdl-config --cflags)) \
 	 $(if $(BEN), -static)
 
-LDLIBS = -L../../ben-wpan/tools/lib -latrf  \
+LDLIBS = -L../../../ben-wpan/tools/lib -latrf  \
 	 $(if $(NOGFX),, $(shell sdl-config --libs) -lSDL_gfx) \
-	 $(if $(BEN),, -usb)
+	 $(if $(BEN),, -lusb)
 
-OBJS = antorcha.o hash.o $(if $(NOGFX),, plot.o)
+OBJS = ant-cl.o hash.o $(if $(NOGFX),, plot.o)
 
 .PHONY:		all ben clean spotless update ping off
 
diff --git a/tools/antorcha.c b/tools/ant-cl/ant-cl.c
similarity index 99%
rename from tools/antorcha.c
rename to tools/ant-cl/ant-cl.c
index 6dff424..523142f 100644
--- a/tools/antorcha.c
+++ b/tools/ant-cl/ant-cl.c
@@ -1,5 +1,5 @@
 /*
- * tools/antorcha.c - Antorcha control utility
+ * tools/ant-cl/ant-cl.c - Antorcha control utility
  *
  * Written 2012 by Werner Almesberger
  * Copyright 2012 Werner Almesberger
diff --git a/tools/ant-cl/hash.c b/tools/ant-cl/hash.c
new file mode 100644
index 0000000..195c2fd
--- /dev/null
+++ b/tools/ant-cl/hash.c
@@ -0,0 +1 @@
+#include "../../fw/hash.c"
diff --git a/tools/plot.c b/tools/ant-cl/plot.c
similarity index 98%
rename from tools/plot.c
rename to tools/ant-cl/plot.c
index bbe3d6f..732d67f 100644
--- a/tools/plot.c
+++ b/tools/ant-cl/plot.c
@@ -1,5 +1,5 @@
 /*
- * tools/plot.c - Sample plot
+ * tools/ant-cl/plot.c - Sample plot
  *
  * Written 2012 by Werner Almesberger
  * Copyright 2012 Werner Almesberger
diff --git a/tools/plot.h b/tools/ant-cl/plot.h
similarity index 92%
rename from tools/plot.h
rename to tools/ant-cl/plot.h
index fb6a621..7303ec0 100644
--- a/tools/plot.h
+++ b/tools/ant-cl/plot.h
@@ -1,5 +1,5 @@
 /*
- * tools/plot.h - Sample plot
+ * tools/ant-cl/plot.h - Sample plot
  *
  * Written 2012 by Werner Almesberger
  * Copyright 2012 Werner Almesberger
diff --git a/tools/hash.c b/tools/hash.c
deleted file mode 100644
index 8c33add..0000000
--- a/tools/hash.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../fw/hash.c"