diff --git a/src/Makefile b/src/Makefile
index 09bede17..fae083ff 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -144,9 +144,7 @@ SRCDIRS		+= drivers/bitbash
 SRCDIRS		+= interface/pxe
 SRCDIRS		+= tests
 SRCDIRS		+= crypto
-SRCDIRS		+= hci hci/mucurses
-SRCDIRS		+= commandline
-SRCDIRS		+= commandline/commands
+SRCDIRS		+= hci hci/commands hci/mucurses
 
 # NON_AUTO_SRCS lists files that are excluded from the normal
 # automatic build system.
diff --git a/src/commandline/commands/nvo_cmd.c b/src/hci/commands/nvo_cmd.c
similarity index 100%
rename from src/commandline/commands/nvo_cmd.c
rename to src/hci/commands/nvo_cmd.c