diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 9734e0d..0b6c940 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -34,12 +34,12 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 set( PROGRAM_EXE ${PROJECT_NAME} )
 
 set( PROGRAM_SRC
-	main.cpp
-	MainWindow.cpp
-	GenerateWindow.cpp
-	SearchWindow.cpp
-	MultiSelect.cpp
-	helpers.cpp
+	src/main.cpp
+	src/MainWindow.cpp
+	src/GenerateWindow.cpp
+	src/SearchWindow.cpp
+	src/MultiSelect.cpp
+	src/helpers.cpp
 )
 
 add_executable( ${PROGRAM_EXE} WIN32 ${PROGRAM_SRC} )
diff --git a/gui/GenerateWindow.cpp b/gui/src/GenerateWindow.cpp
similarity index 100%
rename from gui/GenerateWindow.cpp
rename to gui/src/GenerateWindow.cpp
diff --git a/gui/GenerateWindow.hpp b/gui/src/GenerateWindow.hpp
similarity index 100%
rename from gui/GenerateWindow.hpp
rename to gui/src/GenerateWindow.hpp
diff --git a/gui/MainWindow.cpp b/gui/src/MainWindow.cpp
similarity index 100%
rename from gui/MainWindow.cpp
rename to gui/src/MainWindow.cpp
diff --git a/gui/MainWindow.hpp b/gui/src/MainWindow.hpp
similarity index 100%
rename from gui/MainWindow.hpp
rename to gui/src/MainWindow.hpp
diff --git a/gui/MultiSelect.cpp b/gui/src/MultiSelect.cpp
similarity index 100%
rename from gui/MultiSelect.cpp
rename to gui/src/MultiSelect.cpp
diff --git a/gui/MultiSelect.hpp b/gui/src/MultiSelect.hpp
similarity index 100%
rename from gui/MultiSelect.hpp
rename to gui/src/MultiSelect.hpp
diff --git a/gui/SearchWindow.cpp b/gui/src/SearchWindow.cpp
similarity index 100%
rename from gui/SearchWindow.cpp
rename to gui/src/SearchWindow.cpp
diff --git a/gui/SearchWindow.hpp b/gui/src/SearchWindow.hpp
similarity index 100%
rename from gui/SearchWindow.hpp
rename to gui/src/SearchWindow.hpp
diff --git a/gui/helpers.cpp b/gui/src/helpers.cpp
similarity index 100%
rename from gui/helpers.cpp
rename to gui/src/helpers.cpp
diff --git a/gui/helpers.hpp b/gui/src/helpers.hpp
similarity index 100%
rename from gui/helpers.hpp
rename to gui/src/helpers.hpp
diff --git a/gui/main.cpp b/gui/src/main.cpp
similarity index 100%
rename from gui/main.cpp
rename to gui/src/main.cpp