diff --git a/Makefile.am b/Makefile.am
index 61465f80..ee525caa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ dist_noinst_SCRIPTS = autogen.sh
 
 noinst_PROGRAMS = feed
 
-feed_SOURCES = test/feed.cpp \
+feed_SOURCES = tools/feed.cpp \
 	       utils/appl.cpp
 
 feed_LDADD = $(LIBEBUS_LIBS)
diff --git a/src/baseloop.cpp b/src/baseloop.cpp
index 8cb402fb..3f6c8360 100644
--- a/src/baseloop.cpp
+++ b/src/baseloop.cpp
@@ -264,7 +264,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 		break;
 
 	case help:
-		result << std::endl
+		result << "commands:" << std::endl
 		       << " get       - fetch ebus data       [get class cmd (sub)]" << std::endl
 		       << " set       - set ebus values       [set class cmd value]" << std::endl
 		       << " cyc       - fetch cycle data      [cyc class cmd (sub)]" << std::endl
diff --git a/test/ebus_dump.bin b/tools/ebus_dump.bin
similarity index 100%
rename from test/ebus_dump.bin
rename to tools/ebus_dump.bin
diff --git a/test/feed.cpp b/tools/feed.cpp
similarity index 100%
rename from test/feed.cpp
rename to tools/feed.cpp