diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 9080728..f08a281 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -8,18 +8,18 @@ option(FORCE_ANSI "Force ANSI console colors even on windows" OFF)
 set (PROGRAM_EXE ${CMAKE_PROJECT_NAME})
 
 set (PROGRAM_SOURCE
-	isatty.cpp
-	cli_key_search_result.cpp
-	console.cpp
-	benchmark.cpp
-	main.cpp
+	src/isatty.cpp
+	src/cli_key_search_result.cpp
+	src/console.cpp
+	src/benchmark.cpp
+	src/main.cpp
 )
 
 if (WIN32 AND NOT FORCE_ANSI)
-	set (PROGRAM_SOURCE ${PROGRAM_SOURCE} console_win32.cpp)
+	set (PROGRAM_SOURCE ${PROGRAM_SOURCE} src/console_win32.cpp)
 else()
 	# *nix should have ansi support.
-	set (PROGRAM_SOURCE ${PROGRAM_SOURCE} console_ansi.cpp)
+	set (PROGRAM_SOURCE ${PROGRAM_SOURCE} src/console_ansi.cpp)
 endif()
 
 add_executable( ${PROGRAM_EXE} ${PROGRAM_SOURCE} )
diff --git a/cli/benchmark.cpp b/cli/src/benchmark.cpp
similarity index 100%
rename from cli/benchmark.cpp
rename to cli/src/benchmark.cpp
diff --git a/cli/benchmark.hpp b/cli/src/benchmark.hpp
similarity index 100%
rename from cli/benchmark.hpp
rename to cli/src/benchmark.hpp
diff --git a/cli/cli_key_search_result.cpp b/cli/src/cli_key_search_result.cpp
similarity index 100%
rename from cli/cli_key_search_result.cpp
rename to cli/src/cli_key_search_result.cpp
diff --git a/cli/cli_key_search_result.hpp b/cli/src/cli_key_search_result.hpp
similarity index 100%
rename from cli/cli_key_search_result.hpp
rename to cli/src/cli_key_search_result.hpp
diff --git a/cli/console.cpp b/cli/src/console.cpp
similarity index 100%
rename from cli/console.cpp
rename to cli/src/console.cpp
diff --git a/cli/console.hpp b/cli/src/console.hpp
similarity index 100%
rename from cli/console.hpp
rename to cli/src/console.hpp
diff --git a/cli/console_ansi.cpp b/cli/src/console_ansi.cpp
similarity index 100%
rename from cli/console_ansi.cpp
rename to cli/src/console_ansi.cpp
diff --git a/cli/console_win32.cpp b/cli/src/console_win32.cpp
similarity index 100%
rename from cli/console_win32.cpp
rename to cli/src/console_win32.cpp
diff --git a/cli/isatty.cpp b/cli/src/isatty.cpp
similarity index 100%
rename from cli/isatty.cpp
rename to cli/src/isatty.cpp
diff --git a/cli/isatty.hpp b/cli/src/isatty.hpp
similarity index 100%
rename from cli/isatty.hpp
rename to cli/src/isatty.hpp
diff --git a/cli/main.cpp b/cli/src/main.cpp
similarity index 100%
rename from cli/main.cpp
rename to cli/src/main.cpp