diff --git a/CMakeLists.txt b/CMakeLists.txt
index 166e986..ef284f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,7 +100,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 
 
   # The compiled library code is here
-  add_subdirectory(src)
+  add_subdirectory(src/serene)
 
   # The executable code is here
   add_subdirectory(bin)
@@ -111,7 +111,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
   # Emergency override SERENE_CMAKE_BUILD_TESTING provided as well
   if(BUILD_TESTING)
     message("Build the test binary")
-    add_subdirectory(tests)
+    add_subdirectory(src/tests)
   endif()
 
   if (CMAKE_BUILD_TYPE STREQUAL "Release")
diff --git a/src/CMakeLists.txt b/src/serene/CMakeLists.txt
similarity index 100%
rename from src/CMakeLists.txt
rename to src/serene/CMakeLists.txt
diff --git a/src/error.cpp b/src/serene/error.cpp
similarity index 100%
rename from src/error.cpp
rename to src/serene/error.cpp
diff --git a/src/exprs/expression.cpp b/src/serene/exprs/expression.cpp
similarity index 100%
rename from src/exprs/expression.cpp
rename to src/serene/exprs/expression.cpp
diff --git a/src/exprs/list.cpp b/src/serene/exprs/list.cpp
similarity index 100%
rename from src/exprs/list.cpp
rename to src/serene/exprs/list.cpp
diff --git a/src/exprs/number.cpp b/src/serene/exprs/number.cpp
similarity index 100%
rename from src/exprs/number.cpp
rename to src/serene/exprs/number.cpp
diff --git a/src/exprs/symbol.cpp b/src/serene/exprs/symbol.cpp
similarity index 100%
rename from src/exprs/symbol.cpp
rename to src/serene/exprs/symbol.cpp
diff --git a/src/list.cpp b/src/serene/list.cpp
similarity index 100%
rename from src/list.cpp
rename to src/serene/list.cpp
diff --git a/src/namespace.cpp b/src/serene/namespace.cpp
similarity index 100%
rename from src/namespace.cpp
rename to src/serene/namespace.cpp
diff --git a/src/number.cpp b/src/serene/number.cpp
similarity index 100%
rename from src/number.cpp
rename to src/serene/number.cpp
diff --git a/src/reader/errors.cpp b/src/serene/reader/errors.cpp
similarity index 100%
rename from src/reader/errors.cpp
rename to src/serene/reader/errors.cpp
diff --git a/src/reader/location.cpp b/src/serene/reader/location.cpp
similarity index 100%
rename from src/reader/location.cpp
rename to src/serene/reader/location.cpp
diff --git a/src/reader/reader.cpp b/src/serene/reader/reader.cpp
similarity index 100%
rename from src/reader/reader.cpp
rename to src/serene/reader/reader.cpp
diff --git a/src/reader/semantics.cpp b/src/serene/reader/semantics.cpp
similarity index 100%
rename from src/reader/semantics.cpp
rename to src/serene/reader/semantics.cpp
diff --git a/src/serene.cpp b/src/serene/serene.cpp
similarity index 100%
rename from src/serene.cpp
rename to src/serene/serene.cpp
diff --git a/src/sir/dialect.cpp b/src/serene/sir/dialect.cpp
similarity index 100%
rename from src/sir/dialect.cpp
rename to src/serene/sir/dialect.cpp
diff --git a/src/sir/generator.cpp b/src/serene/sir/generator.cpp
similarity index 100%
rename from src/sir/generator.cpp
rename to src/serene/sir/generator.cpp
diff --git a/src/sir/sir.cpp b/src/serene/sir/sir.cpp
similarity index 100%
rename from src/sir/sir.cpp
rename to src/serene/sir/sir.cpp
diff --git a/src/sir/value_op.cpp b/src/serene/sir/value_op.cpp
similarity index 100%
rename from src/sir/value_op.cpp
rename to src/serene/sir/value_op.cpp
diff --git a/src/state.cpp b/src/serene/state.cpp
similarity index 100%
rename from src/state.cpp
rename to src/serene/state.cpp
diff --git a/src/symbol.cpp b/src/serene/symbol.cpp
similarity index 100%
rename from src/symbol.cpp
rename to src/serene/symbol.cpp
diff --git a/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
similarity index 100%
rename from tests/CMakeLists.txt
rename to src/tests/CMakeLists.txt
diff --git a/tests/exprs/expression_tests.cpp.inc b/src/tests/exprs/expression_tests.cpp.inc
similarity index 100%
rename from tests/exprs/expression_tests.cpp.inc
rename to src/tests/exprs/expression_tests.cpp.inc
diff --git a/tests/exprs/list_test.cpp b/src/tests/exprs/list_test.cpp
similarity index 100%
rename from tests/exprs/list_test.cpp
rename to src/tests/exprs/list_test.cpp
diff --git a/tests/exprs/number_tests.cpp.inc b/src/tests/exprs/number_tests.cpp.inc
similarity index 100%
rename from tests/exprs/number_tests.cpp.inc
rename to src/tests/exprs/number_tests.cpp.inc
diff --git a/tests/exprs/symbol_tests.cpp.inc b/src/tests/exprs/symbol_tests.cpp.inc
similarity index 100%
rename from tests/exprs/symbol_tests.cpp.inc
rename to src/tests/exprs/symbol_tests.cpp.inc
diff --git a/tests/reader/reader_tests.cpp.inc b/src/tests/reader/reader_tests.cpp.inc
similarity index 100%
rename from tests/reader/reader_tests.cpp.inc
rename to src/tests/reader/reader_tests.cpp.inc
diff --git a/tests/serenetests.cpp b/src/tests/serenetests.cpp
similarity index 100%
rename from tests/serenetests.cpp
rename to src/tests/serenetests.cpp
diff --git a/tests/test_helpers.cpp.inc b/src/tests/test_helpers.cpp.inc
similarity index 100%
rename from tests/test_helpers.cpp.inc
rename to src/tests/test_helpers.cpp.inc
diff --git a/tests/utils_tests.cpp.inc b/src/tests/utils_tests.cpp.inc
similarity index 100%
rename from tests/utils_tests.cpp.inc
rename to src/tests/utils_tests.cpp.inc