diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8525086..f5f99e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,14 +37,14 @@ set(PROJECT_SOURCES
     tweaks-qt/maindialog.ui
     tweaks-qt/maindialog.cpp
     tweaks-qt/maindialog.h
-    environment.c
-    environment.h
-    theme.c
-    theme.h
-    xml.c
-    xml.h
-    keyboard-layouts.c
-    keyboard-layouts.h
+    src/environment.c
+    src/environment.h
+    src/theme.c
+    src/theme.h
+    src/xml.c
+    src/xml.h
+    src/keyboard-layouts.c
+    src/keyboard-layouts.h
 )
 set(PROJECT_OTHER_FILES
     .github/workflows/build.yml
@@ -97,9 +97,11 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
     PROJECT_TRANSLATION_TEST_ENABLED=${PROJECT_TRANSLATION_TEST_ENABLED}
     PROJECT_TRANSLATION_TEST_LANGUAGE="${PROJECT_TRANSLATION_TEST_LANGUAGE}"
 )
-target_include_directories(${PROJECT_NAME} PRIVATE ${GLIB_INCLUDE_DIRS})
-target_include_directories(${PROJECT_NAME} PRIVATE ${LIBXML2_INCLUDE_DIR})
-
+target_include_directories(${PROJECT_NAME} PRIVATE
+    ${GLIB_INCLUDE_DIRS}
+    ${LIBXML2_INCLUDE_DIR}
+    src
+)
 target_link_libraries(${PROJECT_NAME} PRIVATE
     Qt${QT_VERSION_MAJOR}::Widgets
     ${GLIB_LDFLAGS}
diff --git a/environment.c b/src/environment.c
similarity index 100%
rename from environment.c
rename to src/environment.c
diff --git a/environment.h b/src/environment.h
similarity index 100%
rename from environment.h
rename to src/environment.h
diff --git a/keyboard-layouts.c b/src/keyboard-layouts.c
similarity index 100%
rename from keyboard-layouts.c
rename to src/keyboard-layouts.c
diff --git a/keyboard-layouts.h b/src/keyboard-layouts.h
similarity index 100%
rename from keyboard-layouts.h
rename to src/keyboard-layouts.h
diff --git a/main.c b/src/main.c
similarity index 100%
rename from main.c
rename to src/main.c
diff --git a/stack-appearance.c b/src/stack-appearance.c
similarity index 100%
rename from stack-appearance.c
rename to src/stack-appearance.c
diff --git a/stack-appearance.h b/src/stack-appearance.h
similarity index 100%
rename from stack-appearance.h
rename to src/stack-appearance.h
diff --git a/stack-lang.c b/src/stack-lang.c
similarity index 100%
rename from stack-lang.c
rename to src/stack-lang.c
diff --git a/stack-lang.h b/src/stack-lang.h
similarity index 100%
rename from stack-lang.h
rename to src/stack-lang.h
diff --git a/stack-mouse.c b/src/stack-mouse.c
similarity index 100%
rename from stack-mouse.c
rename to src/stack-mouse.c
diff --git a/stack-mouse.h b/src/stack-mouse.h
similarity index 100%
rename from stack-mouse.h
rename to src/stack-mouse.h
diff --git a/state.h b/src/state.h
similarity index 100%
rename from state.h
rename to src/state.h
diff --git a/theme.c b/src/theme.c
similarity index 100%
rename from theme.c
rename to src/theme.c
diff --git a/theme.h b/src/theme.h
similarity index 100%
rename from theme.h
rename to src/theme.h
diff --git a/update.c b/src/update.c
similarity index 100%
rename from update.c
rename to src/update.c
diff --git a/update.h b/src/update.h
similarity index 100%
rename from update.h
rename to src/update.h
diff --git a/xml.c b/src/xml.c
similarity index 100%
rename from xml.c
rename to src/xml.c
diff --git a/xml.h b/src/xml.h
similarity index 100%
rename from xml.h
rename to src/xml.h