diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4e36f0..d1a38d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -223,8 +223,8 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
   add_subdirectory(serene-tblgen)
 
   # The compiled library code is here
-  add_subdirectory(src)
-
+  add_subdirectory(serenec)
+  add_subdirectory(serene-repl)
   # The compiled library code is here
   add_subdirectory(libserene)
 
diff --git a/src/serene-repl/CMakeLists.txt b/serene-repl/CMakeLists.txt
similarity index 93%
rename from src/serene-repl/CMakeLists.txt
rename to serene-repl/CMakeLists.txt
index 174e306..ff2237e 100644
--- a/src/serene-repl/CMakeLists.txt
+++ b/serene-repl/CMakeLists.txt
@@ -46,3 +46,8 @@ target_include_directories(serene-repl PRIVATE ${PROJECT_BINARY_DIR})
 target_include_directories(serene-repl PRIVATE ${INCLUDE_DIR})
 
 install(TARGETS serene-repl DESTINATION bin)
+
+if(SERENE_BUILD_TESTING)
+  message("Build the test binary")
+  add_subdirectory(tests)
+endif()
diff --git a/src/serene-repl/serene-repl.cpp b/serene-repl/serene-repl.cpp
similarity index 100%
rename from src/serene-repl/serene-repl.cpp
rename to serene-repl/serene-repl.cpp
diff --git a/src/serene-repl/serene/linenoise.h b/serene-repl/serene/linenoise.h
similarity index 99%
rename from src/serene-repl/serene/linenoise.h
rename to serene-repl/serene/linenoise.h
index 187ebbf..04e254c 100644
--- a/src/serene-repl/serene/linenoise.h
+++ b/serene-repl/serene/linenoise.h
@@ -128,6 +128,7 @@
 
 #ifndef _WIN32
 #include <sys/ioctl.h>
+
 #include <termios.h>
 #include <unistd.h>
 #else
@@ -148,6 +149,8 @@
 #pragma warning(push)
 #pragma warning(disable : 4996)
 #endif
+#include <sys/types.h>
+
 #include <ctype.h>
 #include <errno.h>
 #include <fstream>
@@ -157,7 +160,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <string>
-#include <sys/types.h>
 #include <vector>
 
 namespace linenoise {
diff --git a/src/serenec/CMakeLists.txt b/serenec/CMakeLists.txt
similarity index 100%
rename from src/serenec/CMakeLists.txt
rename to serenec/CMakeLists.txt
diff --git a/src/serenec/serenec.cpp b/serenec/serenec.cpp
similarity index 100%
rename from src/serenec/serenec.cpp
rename to serenec/serenec.cpp