diff --git a/CMakeLists.txt b/CMakeLists.txt
index 651fd27..030c9b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,36 @@
 cmake_minimum_required(VERSION 3.0.0)
-project(wxRocket VERSION 0.1.0)
+project(
+    wxRocket
+    VERSION 0.1.0
+    DESCRIPTION "Model Rocket Simulation Application"
+    LANGUAGES CXX)
+
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    set(CMAKE_CXX_EXTENSIONS OFF)
+    set(CMAKE_CXX_STANDARD 17)
+
+    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+    include(CTest)
+
+    find_package(Doxygen)
+    if(Doxygen_FOUND)
+        add_subdirectory(docs)
+    else()
+        message(STATUS "Doxygen not found, not building docs")
+    endif()
+endif()
 
-include(CTest)
 enable_testing()
 
-find_package(wxWidgets REQUIRED gl core base)
-include(${wxWidgets_USE_FILE})
-add_executable(wxRocket src/main.cpp)
+add_subdirectory(src/gui)
 
-target_link_libraries(wxRocket PRIVATE ${wxWidgets_LIBRARIES})
+#find_package(wxWidgets REQUIRED gl core base)
+#include(${wxWidgets_USE_FILE})
+#add_executable(wxRocket src/main.cpp)
 
-set(CPACK_PROJECT_NAME ${PROJECT_NAME})
-set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
-include(CPack)
+#target_link_libraries(wxRocket PRIVATE ${wxWidgets_LIBRARIES})
+
+#set(CPACK_PROJECT_NAME ${PROJECT_NAME})
+#set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
+#include(CPack)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
new file mode 100644
index 0000000..d640cae
--- /dev/null
+++ b/src/gui/CMakeLists.txt
@@ -0,0 +1,5 @@
+find_package(wxWidgets REQUIRED gl core base)
+include(${wxWidgets_USE_FILE})
+add_executable(wxRocket main.cpp)
+
+target_link_libraries(wxRocket PRIVATE ${wxWidgets_LIBRARIES})
diff --git a/src/main.cpp b/src/gui/main.cpp
similarity index 100%
rename from src/main.cpp
rename to src/gui/main.cpp