diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index aaf52c569b..56f1ed8577 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -29,6 +29,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) source_language ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) types ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface cli ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface cli commands ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui inspector_window ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui model ] ;
@@ -210,8 +211,11 @@ Application Debugger :
 	UserInterface.cpp
 
 	# user_interface/cli
-	CliCommand.cpp
 	CliContext.cpp
+	CommandLineUserInterface.cpp
+
+	# user_interface/cli/commands
+	CliCommand.cpp
 	CliContinueCommand.cpp
 	CliDebugReportCommand.cpp
 	CliDumpMemoryCommand.cpp
@@ -223,7 +227,6 @@ Application Debugger :
 	CliThreadCommand.cpp
 	CliThreadsCommand.cpp
 	CliVariablesCommand.cpp
-	CommandLineUserInterface.cpp
 
 	# user_interface/gui
 	GraphicalUserInterface.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliCommand.h b/src/apps/debugger/user_interface/cli/commands/CliCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliContinueCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliContinueCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliContinueCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliContinueCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliContinueCommand.h b/src/apps/debugger/user_interface/cli/commands/CliContinueCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliContinueCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliContinueCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliDebugReportCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliDebugReportCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliDebugReportCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliDebugReportCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliDebugReportCommand.h b/src/apps/debugger/user_interface/cli/commands/CliDebugReportCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliDebugReportCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliDebugReportCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliDumpMemoryCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliDumpMemoryCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliDumpMemoryCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliDumpMemoryCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliDumpMemoryCommand.h b/src/apps/debugger/user_interface/cli/commands/CliDumpMemoryCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliDumpMemoryCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliDumpMemoryCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliPrintVariableCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliPrintVariableCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliPrintVariableCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliPrintVariableCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliPrintVariableCommand.h b/src/apps/debugger/user_interface/cli/commands/CliPrintVariableCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliPrintVariableCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliPrintVariableCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliQuitCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliQuitCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliQuitCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliQuitCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliQuitCommand.h b/src/apps/debugger/user_interface/cli/commands/CliQuitCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliQuitCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliQuitCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliStackFrameCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliStackFrameCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliStackFrameCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliStackFrameCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliStackFrameCommand.h b/src/apps/debugger/user_interface/cli/commands/CliStackFrameCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliStackFrameCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliStackFrameCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliStackTraceCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliStackTraceCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliStackTraceCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliStackTraceCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliStackTraceCommand.h b/src/apps/debugger/user_interface/cli/commands/CliStackTraceCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliStackTraceCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliStackTraceCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliStopCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliStopCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliStopCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliStopCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliStopCommand.h b/src/apps/debugger/user_interface/cli/commands/CliStopCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliStopCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliStopCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliThreadCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliThreadCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliThreadCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliThreadCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliThreadCommand.h b/src/apps/debugger/user_interface/cli/commands/CliThreadCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliThreadCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliThreadCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliThreadsCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliThreadsCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliThreadsCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliThreadsCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliThreadsCommand.h b/src/apps/debugger/user_interface/cli/commands/CliThreadsCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliThreadsCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliThreadsCommand.h
diff --git a/src/apps/debugger/user_interface/cli/CliVariablesCommand.cpp b/src/apps/debugger/user_interface/cli/commands/CliVariablesCommand.cpp
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliVariablesCommand.cpp
rename to src/apps/debugger/user_interface/cli/commands/CliVariablesCommand.cpp
diff --git a/src/apps/debugger/user_interface/cli/CliVariablesCommand.h b/src/apps/debugger/user_interface/cli/commands/CliVariablesCommand.h
similarity index 100%
rename from src/apps/debugger/user_interface/cli/CliVariablesCommand.h
rename to src/apps/debugger/user_interface/cli/commands/CliVariablesCommand.h