diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f3264ae..fbe40988 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,64 +236,28 @@ SET(PROJECT_DATA_EFFECTS
 )
 SET(PROJECT_DATA_SHADERS
 #	"${PROJECT_SOURCE_DIR}/data/shaders/name.effect"
-)
-SET(PROJECT_DATA_SHADERS_FILTER
 	"${PROJECT_SOURCE_DIR}/data/shaders/filter/example.effect"
 )
-SET(PROJECT_LIBRARIES
-)
-SET(PROJECT_PUBLIC
-)
-SET(PROJECT_PRIVATE
+SET(PROJECT_DATA
 	${PROJECT_DATA_LOCALE}
 	${PROJECT_DATA_EFFECTS}
 	${PROJECT_DATA_SHADERS}
-	${PROJECT_DATA_SHADERS_FILTER}
+)
+
+SET(PROJECT_LIBRARIES
+)
+
+SET(PROJECT_PUBLIC
+)
+SET(PROJECT_PRIVATE_GENERATED
 	"${PROJECT_BINARY_DIR}/source/module.cpp"
 	"${PROJECT_BINARY_DIR}/source/version.hpp"
+)
+SET(PROJECT_PRIVATE_SOURCE
+
+	# Plugin
 	"${PROJECT_SOURCE_DIR}/source/plugin.hpp"
 	"${PROJECT_SOURCE_DIR}/source/plugin.cpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-displacement.hpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-displacement.cpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-blur.hpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-blur.cpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-sdf-effects.hpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-sdf-effects.cpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-shape.hpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-shape.cpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-transform.hpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-transform.cpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-custom-shader.hpp"
-	"${PROJECT_SOURCE_DIR}/source/filter-custom-shader.cpp"
-	"${PROJECT_SOURCE_DIR}/source/source-mirror.hpp"
-	"${PROJECT_SOURCE_DIR}/source/source-mirror.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gfx-effect-source.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gfx-effect-source.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gfx-source-texture.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gfx-source-texture.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-helper.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-helper.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-effect.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-effect.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-indexbuffer.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-indexbuffer.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-limits.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-mipmapper.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-mipmapper.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-rendertarget.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-rendertarget.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-sampler.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-sampler.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-texture.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-texture.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-vertex.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-vertex.cpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-vertexbuffer.hpp"
-	"${PROJECT_SOURCE_DIR}/source/gs-vertexbuffer.cpp"
-	"${PROJECT_SOURCE_DIR}/source/obs-audio-capture.hpp"
-	"${PROJECT_SOURCE_DIR}/source/obs-audio-capture.cpp"
-	"${PROJECT_SOURCE_DIR}/source/obs-tools.hpp"
-	"${PROJECT_SOURCE_DIR}/source/obs-tools.cpp"
 	"${PROJECT_SOURCE_DIR}/source/strings.hpp"
 	"${PROJECT_SOURCE_DIR}/source/utility.hpp"
 	"${PROJECT_SOURCE_DIR}/source/utility.cpp"
@@ -303,16 +267,80 @@ SET(PROJECT_PRIVATE
 	"${PROJECT_SOURCE_DIR}/source/util-math.cpp"
 	"${PROJECT_SOURCE_DIR}/source/util-memory.hpp"
 	"${PROJECT_SOURCE_DIR}/source/util-memory.cpp"
-	"${PROJECT_SOURCE_DIR}/source/obs-source.hpp"
-	"${PROJECT_SOURCE_DIR}/source/obs-source.cpp"
-	"${PROJECT_SOURCE_DIR}/source/obs-source-tracker.hpp"
-	"${PROJECT_SOURCE_DIR}/source/obs-source-tracker.cpp"
+	
+	# Graphics
+	"${PROJECT_SOURCE_DIR}/source/gfx/gfx-effect-source.hpp"
+	"${PROJECT_SOURCE_DIR}/source/gfx/gfx-effect-source.cpp"
+	"${PROJECT_SOURCE_DIR}/source/gfx/gfx-source-texture.hpp"
+	"${PROJECT_SOURCE_DIR}/source/gfx/gfx-source-texture.cpp"
+
+	# OBS
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-helper.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-helper.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-effect.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-effect.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-indexbuffer.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-indexbuffer.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-limits.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-mipmapper.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-mipmapper.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-rendertarget.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-rendertarget.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-sampler.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-sampler.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-texture.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-texture.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-vertex.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-vertex.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-vertexbuffer.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-vertexbuffer.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/obs-audio-capture.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/obs-audio-capture.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/obs-tools.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/obs-tools.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/obs-source.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/obs-source.cpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/obs-source-tracker.hpp"
+	"${PROJECT_SOURCE_DIR}/source/obs/obs-source-tracker.cpp"
+	
+	# Sources
+	"${PROJECT_SOURCE_DIR}/source/sources/source-mirror.hpp"
+	"${PROJECT_SOURCE_DIR}/source/sources/source-mirror.cpp"
+
+	# Filters
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-displacement.hpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-displacement.cpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-blur.hpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-blur.cpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-sdf-effects.hpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-sdf-effects.cpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-shape.hpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-shape.cpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-transform.hpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-transform.cpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-custom-shader.hpp"
+	"${PROJECT_SOURCE_DIR}/source/filters/filter-custom-shader.cpp"
+
+	# Transitions
+)
+set(PROJECT_PRIVATE
+	${PROJECT_DATA}
+	${PROJECT_PRIVATE_GENERATED}
+	${PROJECT_PRIVATE_SOURCE}
 )
 
-source_group("Data Files\\Locale" FILES ${PROJECT_DATA_LOCALE})
-source_group("Data Files\\Effects" FILES ${PROJECT_DATA_EFFECTS})
-source_group("Data Files\\Shaders" FILES ${PROJECT_DATA_SHADERS})
-source_group("Data Files\\Shaders\\Filter" FILES ${PROJECT_DATA_SHADERS_FILTER})
+source_group(TREE "${PROJECT_SOURCE_DIR}/data" PREFIX "Data Files" FILES ${PROJECT_DATA})
+source_group(TREE "${PROJECT_BINARY_DIR}/source" PREFIX "Generated Files" FILES ${PROJECT_PRIVATE_GENERATED})
+
+# Filter Sources
+set(_TMP_SOURCE ${PROJECT_PRIVATE_SOURCE})
+list(FILTER _TMP_SOURCE INCLUDE REGEX "\.(c|cpp)$")
+source_group(TREE "${PROJECT_SOURCE_DIR}/source" PREFIX "Source Files" FILES ${_TMP_SOURCE})
+
+# Filter Headers
+set(_TMP_HEADER ${PROJECT_PRIVATE_SOURCE})
+list(FILTER _TMP_HEADER INCLUDE REGEX "\.(h|hpp)$")
+source_group(TREE "${PROJECT_SOURCE_DIR}/source" PREFIX "Header Files" FILES ${_TMP_HEADER})
 
 ################################################################################
 # Target
diff --git a/source/filter-blur.cpp b/source/filters/filter-blur.cpp
similarity index 99%
rename from source/filter-blur.cpp
rename to source/filters/filter-blur.cpp
index 951b7440..a876f9c3 100644
--- a/source/filter-blur.cpp
+++ b/source/filters/filter-blur.cpp
@@ -22,7 +22,7 @@
 #include <cinttypes>
 #include <cmath>
 #include <map>
-#include "obs-source-tracker.hpp"
+#include "obs/obs-source-tracker.hpp"
 #include "strings.hpp"
 #include "util-math.hpp"
 
diff --git a/source/filter-blur.hpp b/source/filters/filter-blur.hpp
similarity index 97%
rename from source/filter-blur.hpp
rename to source/filters/filter-blur.hpp
index 4e9788aa..69620987 100644
--- a/source/filter-blur.hpp
+++ b/source/filters/filter-blur.hpp
@@ -23,11 +23,11 @@
 #include <list>
 #include <map>
 #include <memory>
-#include "gfx-source-texture.hpp"
-#include "gs-effect.hpp"
-#include "gs-helper.hpp"
-#include "gs-rendertarget.hpp"
-#include "gs-texture.hpp"
+#include "gfx/gfx-source-texture.hpp"
+#include "obs/gs/gs-effect.hpp"
+#include "obs/gs/gs-helper.hpp"
+#include "obs/gs/gs-rendertarget.hpp"
+#include "obs/gs/gs-texture.hpp"
 #include "plugin.hpp"
 
 // OBS
diff --git a/source/filter-custom-shader.cpp b/source/filters/filter-custom-shader.cpp
similarity index 100%
rename from source/filter-custom-shader.cpp
rename to source/filters/filter-custom-shader.cpp
diff --git a/source/filter-custom-shader.hpp b/source/filters/filter-custom-shader.hpp
similarity index 95%
rename from source/filter-custom-shader.hpp
rename to source/filters/filter-custom-shader.hpp
index bd2a1d7d..c107a7b8 100644
--- a/source/filter-custom-shader.hpp
+++ b/source/filters/filter-custom-shader.hpp
@@ -21,9 +21,9 @@
 #include <cinttypes>
 #include <list>
 #include <vector>
-#include "gfx-effect-source.hpp"
-#include "gs-effect.hpp"
-#include "gs-rendertarget.hpp"
+#include "gfx/gfx-effect-source.hpp"
+#include "obs/gs/gs-effect.hpp"
+#include "obs/gs/gs-rendertarget.hpp"
 #include "plugin.hpp"
 
 namespace filter {
diff --git a/source/filter-displacement.cpp b/source/filters/filter-displacement.cpp
similarity index 100%
rename from source/filter-displacement.cpp
rename to source/filters/filter-displacement.cpp
diff --git a/source/filter-displacement.hpp b/source/filters/filter-displacement.hpp
similarity index 99%
rename from source/filter-displacement.hpp
rename to source/filters/filter-displacement.hpp
index 98f3fb3d..ea8a64c9 100644
--- a/source/filter-displacement.hpp
+++ b/source/filters/filter-displacement.hpp
@@ -20,7 +20,7 @@
 #pragma once
 #include <memory>
 #include <string>
-#include "gs-effect.hpp"
+#include "obs/gs/gs-effect.hpp"
 #include "plugin.hpp"
 
 // OBS
diff --git a/source/filter-sdf-effects.cpp b/source/filters/filter-sdf-effects.cpp
similarity index 100%
rename from source/filter-sdf-effects.cpp
rename to source/filters/filter-sdf-effects.cpp
diff --git a/source/filter-sdf-effects.hpp b/source/filters/filter-sdf-effects.hpp
similarity index 95%
rename from source/filter-sdf-effects.hpp
rename to source/filters/filter-sdf-effects.hpp
index 3c1a7ec6..fc477006 100644
--- a/source/filter-sdf-effects.hpp
+++ b/source/filters/filter-sdf-effects.hpp
@@ -19,11 +19,11 @@
 
 #pragma once
 #include <memory>
-#include "gs-effect.hpp"
-#include "gs-rendertarget.hpp"
-#include "gs-sampler.hpp"
-#include "gs-texture.hpp"
-#include "gs-vertexbuffer.hpp"
+#include "obs/gs/gs-effect.hpp"
+#include "obs/gs/gs-rendertarget.hpp"
+#include "obs/gs/gs-sampler.hpp"
+#include "obs/gs/gs-texture.hpp"
+#include "obs/gs/gs-vertexbuffer.hpp"
 #include "plugin.hpp"
 
 // OBS
diff --git a/source/filter-shape.cpp b/source/filters/filter-shape.cpp
similarity index 100%
rename from source/filter-shape.cpp
rename to source/filters/filter-shape.cpp
diff --git a/source/filter-shape.hpp b/source/filters/filter-shape.hpp
similarity index 98%
rename from source/filter-shape.hpp
rename to source/filters/filter-shape.hpp
index fb9c6199..72466be9 100644
--- a/source/filter-shape.hpp
+++ b/source/filters/filter-shape.hpp
@@ -18,7 +18,7 @@
  */
 
 #pragma once
-#include "gs-vertexbuffer.hpp"
+#include "obs/gs/gs-vertexbuffer.hpp"
 #include "plugin.hpp"
 
 #define P_SHAPE "Shape"
diff --git a/source/filter-transform.cpp b/source/filters/filter-transform.cpp
similarity index 100%
rename from source/filter-transform.cpp
rename to source/filters/filter-transform.cpp
diff --git a/source/filter-transform.hpp b/source/filters/filter-transform.hpp
similarity index 95%
rename from source/filter-transform.hpp
rename to source/filters/filter-transform.hpp
index bc6f8a25..b528778a 100644
--- a/source/filter-transform.hpp
+++ b/source/filters/filter-transform.hpp
@@ -20,10 +20,10 @@
 #pragma once
 #include <memory>
 #include <vector>
-#include "gs-mipmapper.hpp"
-#include "gs-rendertarget.hpp"
-#include "gs-texture.hpp"
-#include "gs-vertexbuffer.hpp"
+#include "obs/gs/gs-mipmapper.hpp"
+#include "obs/gs/gs-rendertarget.hpp"
+#include "obs/gs/gs-texture.hpp"
+#include "obs/gs/gs-vertexbuffer.hpp"
 #include "plugin.hpp"
 
 namespace filter {
diff --git a/source/gfx-effect-source.cpp b/source/gfx/gfx-effect-source.cpp
similarity index 100%
rename from source/gfx-effect-source.cpp
rename to source/gfx/gfx-effect-source.cpp
diff --git a/source/gfx-effect-source.hpp b/source/gfx/gfx-effect-source.hpp
similarity index 96%
rename from source/gfx-effect-source.hpp
rename to source/gfx/gfx-effect-source.hpp
index 4e223456..6d4c4d0c 100644
--- a/source/gfx-effect-source.hpp
+++ b/source/gfx/gfx-effect-source.hpp
@@ -22,11 +22,11 @@
 #include <utility>
 #include <vector>
 #include "gfx-source-texture.hpp"
-#include "gs-effect.hpp"
-#include "gs-mipmapper.hpp"
-#include "gs-rendertarget.hpp"
-#include "gs-texture.hpp"
-#include "gs-vertexbuffer.hpp"
+#include "obs/gs/gs-effect.hpp"
+#include "obs/gs/gs-mipmapper.hpp"
+#include "obs/gs/gs-rendertarget.hpp"
+#include "obs/gs/gs-texture.hpp"
+#include "obs/gs/gs-vertexbuffer.hpp"
 
 // OBS
 #ifdef _MSC_VER
diff --git a/source/gfx-source-texture.cpp b/source/gfx/gfx-source-texture.cpp
similarity index 100%
rename from source/gfx-source-texture.cpp
rename to source/gfx/gfx-source-texture.cpp
diff --git a/source/gfx-source-texture.hpp b/source/gfx/gfx-source-texture.hpp
similarity index 95%
rename from source/gfx-source-texture.hpp
rename to source/gfx/gfx-source-texture.hpp
index 5fcd91fb..912d7b50 100644
--- a/source/gfx-source-texture.hpp
+++ b/source/gfx/gfx-source-texture.hpp
@@ -18,9 +18,9 @@
 #pragma once
 #include <memory>
 #include <string>
-#include "gs-rendertarget.hpp"
-#include "gs-texture.hpp"
-#include "obs-source.hpp"
+#include "obs/gs/gs-rendertarget.hpp"
+#include "obs/gs/gs-texture.hpp"
+#include "obs/obs-source.hpp"
 
 // OBS
 #ifdef _MSC_VER
diff --git a/source/gs-effect.cpp b/source/obs/gs/gs-effect.cpp
similarity index 100%
rename from source/gs-effect.cpp
rename to source/obs/gs/gs-effect.cpp
diff --git a/source/gs-effect.hpp b/source/obs/gs/gs-effect.hpp
similarity index 100%
rename from source/gs-effect.hpp
rename to source/obs/gs/gs-effect.hpp
diff --git a/source/gs-helper.cpp b/source/obs/gs/gs-helper.cpp
similarity index 100%
rename from source/gs-helper.cpp
rename to source/obs/gs/gs-helper.cpp
diff --git a/source/gs-helper.hpp b/source/obs/gs/gs-helper.hpp
similarity index 100%
rename from source/gs-helper.hpp
rename to source/obs/gs/gs-helper.hpp
diff --git a/source/gs-indexbuffer.cpp b/source/obs/gs/gs-indexbuffer.cpp
similarity index 100%
rename from source/gs-indexbuffer.cpp
rename to source/obs/gs/gs-indexbuffer.cpp
diff --git a/source/gs-indexbuffer.hpp b/source/obs/gs/gs-indexbuffer.hpp
similarity index 100%
rename from source/gs-indexbuffer.hpp
rename to source/obs/gs/gs-indexbuffer.hpp
diff --git a/source/gs-limits.hpp b/source/obs/gs/gs-limits.hpp
similarity index 100%
rename from source/gs-limits.hpp
rename to source/obs/gs/gs-limits.hpp
diff --git a/source/gs-mipmapper.cpp b/source/obs/gs/gs-mipmapper.cpp
similarity index 100%
rename from source/gs-mipmapper.cpp
rename to source/obs/gs/gs-mipmapper.cpp
diff --git a/source/gs-mipmapper.hpp b/source/obs/gs/gs-mipmapper.hpp
similarity index 100%
rename from source/gs-mipmapper.hpp
rename to source/obs/gs/gs-mipmapper.hpp
diff --git a/source/gs-rendertarget.cpp b/source/obs/gs/gs-rendertarget.cpp
similarity index 100%
rename from source/gs-rendertarget.cpp
rename to source/obs/gs/gs-rendertarget.cpp
diff --git a/source/gs-rendertarget.hpp b/source/obs/gs/gs-rendertarget.hpp
similarity index 100%
rename from source/gs-rendertarget.hpp
rename to source/obs/gs/gs-rendertarget.hpp
diff --git a/source/gs-sampler.cpp b/source/obs/gs/gs-sampler.cpp
similarity index 100%
rename from source/gs-sampler.cpp
rename to source/obs/gs/gs-sampler.cpp
diff --git a/source/gs-sampler.hpp b/source/obs/gs/gs-sampler.hpp
similarity index 100%
rename from source/gs-sampler.hpp
rename to source/obs/gs/gs-sampler.hpp
diff --git a/source/gs-texture.cpp b/source/obs/gs/gs-texture.cpp
similarity index 100%
rename from source/gs-texture.cpp
rename to source/obs/gs/gs-texture.cpp
diff --git a/source/gs-texture.hpp b/source/obs/gs/gs-texture.hpp
similarity index 100%
rename from source/gs-texture.hpp
rename to source/obs/gs/gs-texture.hpp
diff --git a/source/gs-vertex.cpp b/source/obs/gs/gs-vertex.cpp
similarity index 100%
rename from source/gs-vertex.cpp
rename to source/obs/gs/gs-vertex.cpp
diff --git a/source/gs-vertex.hpp b/source/obs/gs/gs-vertex.hpp
similarity index 100%
rename from source/gs-vertex.hpp
rename to source/obs/gs/gs-vertex.hpp
diff --git a/source/gs-vertexbuffer.cpp b/source/obs/gs/gs-vertexbuffer.cpp
similarity index 100%
rename from source/gs-vertexbuffer.cpp
rename to source/obs/gs/gs-vertexbuffer.cpp
diff --git a/source/gs-vertexbuffer.hpp b/source/obs/gs/gs-vertexbuffer.hpp
similarity index 100%
rename from source/gs-vertexbuffer.hpp
rename to source/obs/gs/gs-vertexbuffer.hpp
diff --git a/source/obs-audio-capture.cpp b/source/obs/obs-audio-capture.cpp
similarity index 100%
rename from source/obs-audio-capture.cpp
rename to source/obs/obs-audio-capture.cpp
diff --git a/source/obs-audio-capture.hpp b/source/obs/obs-audio-capture.hpp
similarity index 100%
rename from source/obs-audio-capture.hpp
rename to source/obs/obs-audio-capture.hpp
diff --git a/source/obs-source-tracker.cpp b/source/obs/obs-source-tracker.cpp
similarity index 100%
rename from source/obs-source-tracker.cpp
rename to source/obs/obs-source-tracker.cpp
diff --git a/source/obs-source-tracker.hpp b/source/obs/obs-source-tracker.hpp
similarity index 100%
rename from source/obs-source-tracker.hpp
rename to source/obs/obs-source-tracker.hpp
diff --git a/source/obs-source.cpp b/source/obs/obs-source.cpp
similarity index 100%
rename from source/obs-source.cpp
rename to source/obs/obs-source.cpp
diff --git a/source/obs-source.hpp b/source/obs/obs-source.hpp
similarity index 100%
rename from source/obs-source.hpp
rename to source/obs/obs-source.hpp
diff --git a/source/obs-tools.cpp b/source/obs/obs-tools.cpp
similarity index 100%
rename from source/obs-tools.cpp
rename to source/obs/obs-tools.cpp
diff --git a/source/obs-tools.hpp b/source/obs/obs-tools.hpp
similarity index 100%
rename from source/obs-tools.hpp
rename to source/obs/obs-tools.hpp
diff --git a/source/plugin.cpp b/source/plugin.cpp
index 56203fc4..d746ecaa 100644
--- a/source/plugin.cpp
+++ b/source/plugin.cpp
@@ -18,11 +18,7 @@
 */
 
 #include "plugin.hpp"
-#include "filter-blur.hpp"
-#include "filter-displacement.hpp"
-#include "filter-shape.hpp"
-#include "filter-transform.hpp"
-#include "obs-source-tracker.hpp"
+#include "obs/obs-source-tracker.hpp"
 
 std::list<std::function<void()>> initializerFunctions;
 std::list<std::function<void()>> finalizerFunctions;
diff --git a/source/source-mirror.cpp b/source/sources/source-mirror.cpp
similarity index 99%
rename from source/source-mirror.cpp
rename to source/sources/source-mirror.cpp
index 68713374..cdd09ccc 100644
--- a/source/source-mirror.cpp
+++ b/source/sources/source-mirror.cpp
@@ -23,7 +23,7 @@
 #include <functional>
 #include <memory>
 #include <vector>
-#include "obs-tools.hpp"
+#include "obs/obs-tools.hpp"
 #include "strings.hpp"
 
 // OBS
diff --git a/source/source-mirror.hpp b/source/sources/source-mirror.hpp
similarity index 96%
rename from source/source-mirror.hpp
rename to source/sources/source-mirror.hpp
index 02626b69..7e9d1c0b 100644
--- a/source/source-mirror.hpp
+++ b/source/sources/source-mirror.hpp
@@ -23,11 +23,11 @@
 #include <mutex>
 #include <thread>
 #include <vector>
-#include "gfx-source-texture.hpp"
-#include "gs-rendertarget.hpp"
-#include "gs-sampler.hpp"
-#include "obs-audio-capture.hpp"
-#include "obs-source.hpp"
+#include "gfx/gfx-source-texture.hpp"
+#include "obs/gs/gs-rendertarget.hpp"
+#include "obs/gs/gs-sampler.hpp"
+#include "obs/obs-audio-capture.hpp"
+#include "obs/obs-source.hpp"
 #include "plugin.hpp"
 
 // OBS