diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index b220ced..febd4f0 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,31 +1 @@
-set(target plasp-app)
-
-find_package(Boost 1.55.0 COMPONENTS program_options iostreams system REQUIRED)
-
-file(GLOB core_sources "*.cpp")
-file(GLOB core_headers "*.h")
-
-set(includes
-	${Boost_INCLUDE_DIRS}
-	${PROJECT_SOURCE_DIR}/include
-	${PROJECT_SOURCE_DIR}/lib/tokenize/include
-	${PROJECT_SOURCE_DIR}/lib/colorlog/include
-	${PROJECT_SOURCE_DIR}/lib/variant/include
-	${PROJECT_SOURCE_DIR}/lib/pddl/include
-)
-
-set(sources
-	${core_sources}
-	${core_headers}
-)
-
-set(libraries
-	stdc++fs
-	${Boost_LIBRARIES}
-	plasp
-)
-
-add_executable(${target} ${sources})
-target_include_directories(${target} PRIVATE ${includes})
-target_link_libraries(${target} ${libraries})
-set_target_properties(${target} PROPERTIES OUTPUT_NAME plasp)
+add_subdirectory(src)
diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt
new file mode 100644
index 0000000..caa9458
--- /dev/null
+++ b/app/src/CMakeLists.txt
@@ -0,0 +1,36 @@
+set(target plasp-app)
+
+find_package(Boost 1.55.0 COMPONENTS program_options iostreams system REQUIRED)
+
+file(GLOB core_sources "*.cpp")
+file(GLOB core_headers "../include/*.h")
+
+file(GLOB commands_sources "commands/*.cpp")
+file(GLOB commands_headers "../include/commands/*.h")
+
+set(includes
+	${Boost_INCLUDE_DIRS}
+	${PROJECT_SOURCE_DIR}/include
+	${PROJECT_SOURCE_DIR}/lib/tokenize/include
+	${PROJECT_SOURCE_DIR}/lib/colorlog/include
+	${PROJECT_SOURCE_DIR}/lib/variant/include
+	${PROJECT_SOURCE_DIR}/lib/pddl/include
+)
+
+set(sources
+	${core_sources}
+	${core_headers}
+	${commands_sources}
+	${commands_headers}
+)
+
+set(libraries
+	stdc++fs
+	${Boost_LIBRARIES}
+	plasp
+)
+
+add_executable(${target} ${sources})
+target_include_directories(${target} PRIVATE ${includes})
+target_link_libraries(${target} ${libraries})
+set_target_properties(${target} PROPERTIES OUTPUT_NAME plasp)
diff --git a/app/main.cpp b/app/src/main.cpp
similarity index 100%
rename from app/main.cpp
rename to app/src/main.cpp