diff --git a/advanced-scene-switcher-module.c b/src/advanced-scene-switcher-module.c
similarity index 100%
rename from advanced-scene-switcher-module.c
rename to src/advanced-scene-switcher-module.c
diff --git a/advanced-scene-switcher.cpp b/src/advanced-scene-switcher.cpp
similarity index 99%
rename from advanced-scene-switcher.cpp
rename to src/advanced-scene-switcher.cpp
index 8bc520e2..5bb7c5c8 100644
--- a/advanced-scene-switcher.cpp
+++ b/src/advanced-scene-switcher.cpp
@@ -20,9 +20,9 @@
 #include <mutex>
 #include <fstream>
 
-#include "switcher-data-structs.hpp"
-#include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "headers/switcher-data-structs.hpp"
+#include "headers/utility.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 
 SwitcherData* switcher = nullptr;
diff --git a/executable-switch.cpp b/src/executable-switch.cpp
similarity index 98%
rename from executable-switch.cpp
rename to src/executable-switch.cpp
index efe5f292..009a41d4 100644
--- a/executable-switch.cpp
+++ b/src/executable-switch.cpp
@@ -1,4 +1,4 @@
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 int SceneSwitcher::executableFindByData(const QString& exe)
 {
diff --git a/file-switch.cpp b/src/file-switch.cpp
similarity index 99%
rename from file-switch.cpp
rename to src/file-switch.cpp
index a315d380..909452ca 100644
--- a/file-switch.cpp
+++ b/src/file-switch.cpp
@@ -2,7 +2,7 @@
 #include <QTextStream>
 #include <QDateTime>
 #include <obs.hpp>
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 
 
diff --git a/general.cpp b/src/general.cpp
similarity index 97%
rename from general.cpp
rename to src/general.cpp
index 73aa2f17..3fe65e72 100644
--- a/general.cpp
+++ b/src/general.cpp
@@ -1,4 +1,4 @@
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 #include <obs-module.h>
 
 void SceneSwitcher::on_close_clicked()
diff --git a/advanced-scene-switcher.hpp b/src/headers/advanced-scene-switcher.hpp
similarity index 99%
rename from advanced-scene-switcher.hpp
rename to src/headers/advanced-scene-switcher.hpp
index 185fd38d..c4784c56 100644
--- a/advanced-scene-switcher.hpp
+++ b/src/headers/advanced-scene-switcher.hpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 #include <string>
-#include "ui_advanced-scene-switcher.h"
+#include "../forms/ui_advanced-scene-switcher.h"
 #include "switcher-data-structs.hpp"
 
 class QCloseEvent;
diff --git a/switcher-data-structs.hpp b/src/headers/switcher-data-structs.hpp
similarity index 100%
rename from switcher-data-structs.hpp
rename to src/headers/switcher-data-structs.hpp
diff --git a/utility.hpp b/src/headers/utility.hpp
similarity index 100%
rename from utility.hpp
rename to src/headers/utility.hpp
diff --git a/hotkey.cpp b/src/hotkey.cpp
similarity index 97%
rename from hotkey.cpp
rename to src/hotkey.cpp
index dd998c26..03c47e36 100644
--- a/hotkey.cpp
+++ b/src/hotkey.cpp
@@ -1,5 +1,5 @@
 #include <obs-module.h>
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 void startStopHotkeyFunc(void* data, obs_hotkey_id id, obs_hotkey_t* hotkey, bool pressed)
 {
diff --git a/idle-switch.cpp b/src/idle-switch.cpp
similarity index 98%
rename from idle-switch.cpp
rename to src/idle-switch.cpp
index 99a12918..371d2a23 100644
--- a/idle-switch.cpp
+++ b/src/idle-switch.cpp
@@ -1,4 +1,4 @@
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 void SwitcherData::checkIdleSwitch(bool& match, OBSWeakSource& scene, OBSWeakSource& transition)
 {
diff --git a/advanced-scene-switcher-nix.cpp b/src/linux/advanced-scene-switcher-nix.cpp
similarity index 100%
rename from advanced-scene-switcher-nix.cpp
rename to src/linux/advanced-scene-switcher-nix.cpp
diff --git a/advanced-scene-switcher-osx.mm b/src/osx/advanced-scene-switcher-osx.mm
similarity index 100%
rename from advanced-scene-switcher-osx.mm
rename to src/osx/advanced-scene-switcher-osx.mm
diff --git a/pause-switch.cpp b/src/pause-switch.cpp
similarity index 99%
rename from pause-switch.cpp
rename to src/pause-switch.cpp
index 719a15e9..f6b30c53 100644
--- a/pause-switch.cpp
+++ b/src/pause-switch.cpp
@@ -1,4 +1,4 @@
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 void SceneSwitcher::on_pauseScenesAdd_clicked()
 {
diff --git a/priority.cpp b/src/priority.cpp
similarity index 96%
rename from priority.cpp
rename to src/priority.cpp
index 791b3e06..a6734edb 100644
--- a/priority.cpp
+++ b/src/priority.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 void SceneSwitcher::on_priorityUp_clicked()
 {
diff --git a/random.cpp b/src/random.cpp
similarity index 98%
rename from random.cpp
rename to src/random.cpp
index d940ba6c..6da40df5 100644
--- a/random.cpp
+++ b/src/random.cpp
@@ -1,4 +1,4 @@
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 void SceneSwitcher::on_randomScenesList_currentRowChanged(int idx)
 {
diff --git a/scene-round-trip.cpp b/src/scene-round-trip.cpp
similarity index 99%
rename from scene-round-trip.cpp
rename to src/scene-round-trip.cpp
index 95c6ca05..aaae6f26 100644
--- a/scene-round-trip.cpp
+++ b/src/scene-round-trip.cpp
@@ -2,7 +2,7 @@
 #include <QTextStream>
 #include <obs.hpp>
 
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 void SceneSwitcher::on_sceneRoundTripAdd_clicked()
 {
diff --git a/scene-transitions.cpp b/src/scene-transitions.cpp
similarity index 99%
rename from scene-transitions.cpp
rename to src/scene-transitions.cpp
index b9dd4016..578e473e 100644
--- a/scene-transitions.cpp
+++ b/src/scene-transitions.cpp
@@ -1,4 +1,4 @@
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 void SceneSwitcher::on_transitionsAdd_clicked()
 {
diff --git a/screen-region-switch.cpp b/src/screen-region-switch.cpp
similarity index 98%
rename from screen-region-switch.cpp
rename to src/screen-region-switch.cpp
index 45d17765..bd42ab85 100644
--- a/screen-region-switch.cpp
+++ b/src/screen-region-switch.cpp
@@ -1,4 +1,4 @@
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 void SwitcherData::checkScreenRegionSwitch(bool& match, OBSWeakSource& scene, OBSWeakSource& transition)
 {
diff --git a/advanced-scene-switcher-win.cpp b/src/win/advanced-scene-switcher-win.cpp
similarity index 100%
rename from advanced-scene-switcher-win.cpp
rename to src/win/advanced-scene-switcher-win.cpp
diff --git a/window-title-switch.cpp b/src/window-title-switch.cpp
similarity index 99%
rename from window-title-switch.cpp
rename to src/window-title-switch.cpp
index 9dd37746..ce24f448 100644
--- a/window-title-switch.cpp
+++ b/src/window-title-switch.cpp
@@ -1,5 +1,5 @@
 #include <obs-module.h>
-#include "advanced-scene-switcher.hpp"
+#include "headers/advanced-scene-switcher.hpp"
 
 void SceneSwitcher::on_add_clicked()
 {