diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e79759..ff12059 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,18 +18,6 @@ EXECUTE_PROCESS(
 )
 
 ADD_CUSTOM_TARGET(HooBaseVisitor ALL DEPENDS ${ANTLR_GENERATED_DIR}/HooBaseVisitor.cpp)
-
 INCLUDE_DIRECTORIES(${ANTLR_GENERATED_DIR} ${ANTLR_INCLUDE_DIR})
 
-ADD_LIBRARY(hoocore STATIC HooCore.cpp HooCore.hpp Node.hpp)
-
-ADD_EXECUTABLE(hoo
-    Hoo.cpp Visitor.cpp
-    ${ANTLR_GENERATED_DIR}/HooBaseVisitor.cpp
-    ${ANTLR_GENERATED_DIR}/HooVisitor.cpp
-    ${ANTLR_GENERATED_DIR}/HooLexer.cpp
-    ${ANTLR_GENERATED_DIR}/HooParser.cpp)
-
-ADD_DEPENDENCIES(hoo HooBaseVisitor)
-
-TARGET_LINK_LIBRARIES(hoo antlr4-runtime LLVMCore LLVMSupport)
+ADD_SUBDIRECTORY(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..a1e0a76
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,9 @@
+ADD_LIBRARY(hoocore STATIC HooCore.cpp HooCore.hpp Node.hpp)
+ADD_EXECUTABLE(hoo
+    Hoo.cpp Visitor.cpp
+    ${ANTLR_GENERATED_DIR}/HooBaseVisitor.cpp
+    ${ANTLR_GENERATED_DIR}/HooVisitor.cpp
+    ${ANTLR_GENERATED_DIR}/HooLexer.cpp
+    ${ANTLR_GENERATED_DIR}/HooParser.cpp)
+ADD_DEPENDENCIES(hoo HooBaseVisitor)
+TARGET_LINK_LIBRARIES(hoo antlr4-runtime LLVMCore LLVMSupport)
diff --git a/Hoo.cpp b/src/Hoo.cpp
similarity index 100%
rename from Hoo.cpp
rename to src/Hoo.cpp
diff --git a/Hoo.hpp b/src/Hoo.hpp
similarity index 100%
rename from Hoo.hpp
rename to src/Hoo.hpp
diff --git a/HooCore.cpp b/src/HooCore.cpp
similarity index 100%
rename from HooCore.cpp
rename to src/HooCore.cpp
diff --git a/HooCore.hpp b/src/HooCore.hpp
similarity index 100%
rename from HooCore.hpp
rename to src/HooCore.hpp
diff --git a/Node.hpp b/src/Node.hpp
similarity index 100%
rename from Node.hpp
rename to src/Node.hpp
diff --git a/Visitor.cpp b/src/Visitor.cpp
similarity index 100%
rename from Visitor.cpp
rename to src/Visitor.cpp
diff --git a/Visitor.hpp b/src/Visitor.hpp
similarity index 100%
rename from Visitor.hpp
rename to src/Visitor.hpp