diff --git a/CMakeLists.txt b/CMakeLists.txt
index e29d4688..9ce157ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,22 +17,22 @@ add_subdirectory(deps/mbedtls EXCLUDE_FROM_ALL)
 set(ENABLE_PROGRAMS false)
 
 set(obs-websocket_SOURCES 
-	obs-websocket.cpp
-	WSServer.cpp
-	WSRequestHandler.cpp
-	WSEvents.cpp
-	Config.cpp
-	Utils.cpp
-	forms/settings-dialog.cpp)
+	src/obs-websocket.cpp
+	src/WSServer.cpp
+	src/WSRequestHandler.cpp
+	src/WSEvents.cpp
+	src/Config.cpp
+	src/Utils.cpp
+	src/forms/settings-dialog.cpp)
 
 set(obs-websocket_HEADERS
-	obs-websocket.h
-	WSServer.h
-	WSRequestHandler.h
-	WSEvents.h
-	Config.h
-	Utils.h
-	forms/settings-dialog.h)
+	src/obs-websocket.h
+	src/WSServer.h
+	src/WSRequestHandler.h
+	src/WSEvents.h
+	src/Config.h
+	src/Utils.h
+	src/forms/settings-dialog.h)
 
 # --- Platform-independent build settings ---
 add_library(obs-websocket MODULE 
diff --git a/Config.cpp b/src/Config.cpp
similarity index 100%
rename from Config.cpp
rename to src/Config.cpp
diff --git a/Config.h b/src/Config.h
similarity index 100%
rename from Config.h
rename to src/Config.h
diff --git a/Utils.cpp b/src/Utils.cpp
similarity index 100%
rename from Utils.cpp
rename to src/Utils.cpp
diff --git a/Utils.h b/src/Utils.h
similarity index 100%
rename from Utils.h
rename to src/Utils.h
diff --git a/WSEvents.cpp b/src/WSEvents.cpp
similarity index 100%
rename from WSEvents.cpp
rename to src/WSEvents.cpp
diff --git a/WSEvents.h b/src/WSEvents.h
similarity index 100%
rename from WSEvents.h
rename to src/WSEvents.h
diff --git a/WSRequestHandler.cpp b/src/WSRequestHandler.cpp
similarity index 100%
rename from WSRequestHandler.cpp
rename to src/WSRequestHandler.cpp
diff --git a/WSRequestHandler.h b/src/WSRequestHandler.h
similarity index 100%
rename from WSRequestHandler.h
rename to src/WSRequestHandler.h
diff --git a/WSServer.cpp b/src/WSServer.cpp
similarity index 100%
rename from WSServer.cpp
rename to src/WSServer.cpp
diff --git a/WSServer.h b/src/WSServer.h
similarity index 100%
rename from WSServer.h
rename to src/WSServer.h
diff --git a/forms/settings-dialog.cpp b/src/forms/settings-dialog.cpp
similarity index 97%
rename from forms/settings-dialog.cpp
rename to src/forms/settings-dialog.cpp
index 85268a32..059ba4e3 100644
--- a/forms/settings-dialog.cpp
+++ b/src/forms/settings-dialog.cpp
@@ -18,9 +18,9 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <obs-frontend-api.h>
 
-#include "obs-websocket.h"
-#include "Config.h"
-#include "WSServer.h"
+#include "../obs-websocket.h"
+#include "../Config.h"
+#include "../WSServer.h"
 #include "settings-dialog.h"
 #include "ui_settings-dialog.h"
 
diff --git a/forms/settings-dialog.h b/src/forms/settings-dialog.h
similarity index 100%
rename from forms/settings-dialog.h
rename to src/forms/settings-dialog.h
diff --git a/forms/settings-dialog.ui b/src/forms/settings-dialog.ui
similarity index 100%
rename from forms/settings-dialog.ui
rename to src/forms/settings-dialog.ui
diff --git a/obs-websocket.cpp b/src/obs-websocket.cpp
similarity index 100%
rename from obs-websocket.cpp
rename to src/obs-websocket.cpp
diff --git a/obs-websocket.h b/src/obs-websocket.h
similarity index 100%
rename from obs-websocket.h
rename to src/obs-websocket.h