diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb9c5000..20afc4bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,210 +26,229 @@ git_describe(GIT_TAG)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cpp.in"
                "${CMAKE_CURRENT_BINARY_DIR}/src/version.cpp" @ONLY)
 
+# --- Set target sources ---
+
+# Module sources
 target_sources(${PROJECT_NAME} PRIVATE src/advanced-scene-switcher-module.c)
 
+# Generic sources
 target_sources(
   ${LIB_NAME}
-  PRIVATE src/headers/advanced-scene-switcher.hpp
-          src/headers/switcher-data-structs.hpp
-          src/headers/scene-group.hpp
-          src/headers/scene-trigger.hpp
-          src/headers/switch-audio.hpp
-          src/headers/switch-executable.hpp
-          src/headers/switch-file.hpp
-          src/headers/switch-idle.hpp
-          src/headers/switch-media.hpp
-          src/headers/switch-network.hpp
-          src/headers/switch-pause.hpp
-          src/headers/switch-random.hpp
-          src/headers/switch-screen-region.hpp
-          src/headers/switch-time.hpp
-          src/headers/switch-transitions.hpp
-          src/headers/switch-window.hpp
-          src/headers/switch-sequence.hpp
-          src/headers/switch-video.hpp
-          src/headers/switch-generic.hpp
-          src/headers/macro-action.hpp
-          src/headers/macro-action-edit.hpp
-          src/headers/macro-action-audio.hpp
-          src/headers/macro-action-file.hpp
-          src/headers/macro-action-filter.hpp
-          src/headers/macro-action-hotkey.hpp
-          src/headers/macro-action-macro.hpp
-          src/headers/macro-action-media.hpp
-          src/headers/macro-action-plugin-state.hpp
-          src/headers/macro-action-profile.hpp
-          src/headers/macro-action-random.hpp
-          src/headers/macro-action-recording.hpp
-          src/headers/macro-action-replay-buffer.hpp
-          src/headers/macro-action-run.hpp
-          src/headers/macro-action-scene-collection.hpp
-          src/headers/macro-action-scene-order.hpp
-          src/headers/macro-action-scene-switch.hpp
-          src/headers/macro-action-scene-transform.hpp
-          src/headers/macro-action-scene-visibility.hpp
-          src/headers/macro-action-screenshot.hpp
-          src/headers/macro-action-sequence.hpp
-          src/headers/macro-action-source.hpp
-          src/headers/macro-action-streaming.hpp
-          src/headers/macro-action-studio-mode.hpp
-          src/headers/macro-action-systray.hpp
-          src/headers/macro-action-timer.hpp
-          src/headers/macro-action-transition.hpp
-          src/headers/macro-action-virtual-cam.hpp
-          src/headers/macro-action-wait.hpp
-          src/headers/macro-condition.hpp
-          src/headers/macro-condition-edit.hpp
-          src/headers/macro-condition-audio.hpp
-          src/headers/macro-condition-cursor.hpp
-          src/headers/macro-condition-date.hpp
-          src/headers/macro-condition-file.hpp
-          src/headers/macro-condition-filter.hpp
-          src/headers/macro-condition-hotkey.hpp
-          src/headers/macro-condition-idle.hpp
-          src/headers/macro-condition-macro.hpp
-          src/headers/macro-condition-media.hpp
-          src/headers/macro-condition-obs-stats.hpp
-          src/headers/macro-condition-plugin-state.hpp
-          src/headers/macro-condition-process.hpp
-          src/headers/macro-condition-profile.hpp
-          src/headers/macro-condition-recording.hpp
-          src/headers/macro-condition-replay-buffer.hpp
-          src/headers/macro-condition-scene-order.hpp
-          src/headers/macro-condition-scene-transform.hpp
-          src/headers/macro-condition-scene-visibility.hpp
-          src/headers/macro-condition-scene.hpp
-          src/headers/macro-condition-source.hpp
-          src/headers/macro-condition-streaming.hpp
-          src/headers/macro-condition-studio-mode.hpp
-          src/headers/macro-condition-timer.hpp
-          src/headers/macro-condition-transition.hpp
-          src/headers/macro-condition-virtual-cam.hpp
-          src/headers/macro-condition-window.hpp
-          src/headers/macro.hpp
-          src/headers/macro-ref.hpp
-          src/headers/macro-list-entry-widget.hpp
-          src/headers/macro-properties.hpp
-          src/headers/macro-segment.hpp
-          src/headers/macro-segment-list.hpp
-          src/headers/macro-selection.hpp
-          src/headers/curl-helper.hpp
-          src/headers/hotkey.hpp
-          src/headers/scene-item-selection.hpp
-          src/headers/scene-selection.hpp
-          src/headers/screenshot-helper.hpp
-          src/headers/transition-selection.hpp
-          src/headers/name-dialog.hpp
-          src/headers/duration-control.hpp
-          src/headers/file-selection.hpp
-          src/headers/section.hpp
-          src/headers/status-control.hpp
-          src/headers/platform-funcs.hpp
-          src/headers/resizing-text-edit.hpp
-          src/headers/utility.hpp
-          src/headers/volume-control.hpp
-          src/headers/version.h
-          src/advanced-scene-switcher.cpp
-          src/switcher-data-structs.cpp
-          src/scene-group.cpp
-          src/scene-trigger.cpp
-          src/switch-transitions.cpp
-          src/switch-screen-region.cpp
-          src/switch-priority.cpp
-          src/switch-executable.cpp
-          src/switch-idle.cpp
-          src/switch-sequence.cpp
-          src/switch-file.cpp
-          src/switch-window.cpp
-          src/switch-media.cpp
-          src/switch-network.cpp
-          src/file-selection.cpp
-          src/hotkey.cpp
+  PRIVATE src/advanced-scene-switcher.cpp
+          src/advanced-scene-switcher.hpp
           src/general.cpp
-          src/switch-pause.cpp
-          src/switch-random.cpp
-          src/switch-time.cpp
-          src/switch-audio.cpp
-          src/switch-video.cpp
-          src/switch-generic.cpp
-          src/macro-action.cpp
-          src/macro-action-edit.cpp
-          src/macro-action-audio.cpp
-          src/macro-action-file.cpp
-          src/macro-action-filter.cpp
-          src/macro-action-hotkey.cpp
-          src/macro-action-macro.cpp
-          src/macro-action-media.cpp
-          src/macro-action-plugin-state.cpp
-          src/macro-action-profile.cpp
-          src/macro-action-random.cpp
-          src/macro-action-recording.cpp
-          src/macro-action-replay-buffer.cpp
-          src/macro-action-run.cpp
-          src/macro-action-scene-collection.cpp
-          src/macro-action-scene-order.cpp
-          src/macro-action-scene-switch.cpp
-          src/macro-action-scene-transform.cpp
-          src/macro-action-scene-visibility.cpp
-          src/macro-action-screenshot.cpp
-          src/macro-action-sequence.cpp
-          src/macro-action-source.cpp
-          src/macro-action-streaming.cpp
-          src/macro-action-studio-mode.cpp
-          src/macro-action-systray.cpp
-          src/macro-action-timer.cpp
-          src/macro-action-transition.cpp
-          src/macro-action-virtual-cam.cpp
-          src/macro-action-wait.cpp
-          src/macro-condition.cpp
-          src/macro-condition-edit.cpp
-          src/macro-condition-audio.cpp
-          src/macro-condition-cursor.cpp
-          src/macro-condition-date.cpp
-          src/macro-condition-file.cpp
-          src/macro-condition-filter.cpp
-          src/macro-condition-hotkey.cpp
-          src/macro-condition-idle.cpp
-          src/macro-condition-macro.cpp
-          src/macro-condition-media.cpp
-          src/macro-condition-obs-stats.cpp
-          src/macro-condition-plugin-state.cpp
-          src/macro-condition-process.cpp
-          src/macro-condition-profile.cpp
-          src/macro-condition-recording.cpp
-          src/macro-condition-replay-buffer.cpp
-          src/macro-condition-scene-order.cpp
-          src/macro-condition-scene-transform.cpp
-          src/macro-condition-scene-visibility.cpp
-          src/macro-condition-scene.cpp
-          src/macro-condition-source.cpp
-          src/macro-condition-streaming.cpp
-          src/macro-condition-studio-mode.cpp
-          src/macro-condition-timer.cpp
-          src/macro-condition-transition.cpp
-          src/macro-condition-virtual-cam.cpp
-          src/macro-condition-window.cpp
-          src/macro.cpp
-          src/macro-ref.cpp
-          src/macro-list-entry-widget.cpp
-          src/macro-properties.cpp
-          src/macro-segment.cpp
-          src/macro-segment-list.cpp
-          src/macro-selection.cpp
-          src/macro-tab.cpp
-          src/curl-helper.cpp
-          src/scene-item-selection.cpp
-          src/scene-selection.cpp
-          src/screenshot-helper.cpp
-          src/transition-selection.cpp
-          src/name-dialog.cpp
-          src/resizing-text-edit.cpp
-          src/duration-control.cpp
+          src/hotkey.cpp
+          src/hotkey.hpp
+          src/hotkey.hpp
+          src/platform-funcs.hpp
+          src/scene-group.cpp
+          src/scene-group.hpp
           src/status-control.cpp
-          src/section.cpp
-          src/utility.cpp
-          src/volume-control.cpp
-          src/version.cpp)
+          src/status-control.hpp
+          src/switcher-data-structs.cpp
+          src/switcher-data-structs.hpp
+          src/version.cpp
+          src/version.h)
+
+# Legacy function sources
+target_sources(
+  ${LIB_NAME}
+  PRIVATE src/legacy/scene-trigger.cpp
+          src/legacy/scene-trigger.hpp
+          src/legacy/switch-audio.cpp
+          src/legacy/switch-audio.hpp
+          src/legacy/switch-executable.cpp
+          src/legacy/switch-executable.hpp
+          src/legacy/switch-file.cpp
+          src/legacy/switch-file.hpp
+          src/legacy/switch-generic.cpp
+          src/legacy/switch-generic.hpp
+          src/legacy/switch-idle.cpp
+          src/legacy/switch-idle.hpp
+          src/legacy/switch-media.cpp
+          src/legacy/switch-media.hpp
+          src/legacy/switch-network.cpp
+          src/legacy/switch-network.hpp
+          src/legacy/switch-pause.cpp
+          src/legacy/switch-pause.hpp
+          src/legacy/switch-priority.cpp
+          src/legacy/switch-random.cpp
+          src/legacy/switch-random.hpp
+          src/legacy/switch-screen-region.cpp
+          src/legacy/switch-screen-region.hpp
+          src/legacy/switch-sequence.cpp
+          src/legacy/switch-sequence.hpp
+          src/legacy/switch-time.cpp
+          src/legacy/switch-time.hpp
+          src/legacy/switch-transitions.cpp
+          src/legacy/switch-transitions.hpp
+          src/legacy/switch-video.cpp
+          src/legacy/switch-video.hpp
+          src/legacy/switch-window.cpp
+          src/legacy/switch-window.hpp)
+
+# Maro sources
+target_sources(
+  ${LIB_NAME}
+  PRIVATE src/macro-core/macro-action-audio.cpp
+          src/macro-core/macro-action-audio.hpp
+          src/macro-core/macro-action-edit.cpp
+          src/macro-core/macro-action-edit.hpp
+          src/macro-core/macro-action-file.cpp
+          src/macro-core/macro-action-file.hpp
+          src/macro-core/macro-action-filter.cpp
+          src/macro-core/macro-action-filter.hpp
+          src/macro-core/macro-action-hotkey.cpp
+          src/macro-core/macro-action-hotkey.hpp
+          src/macro-core/macro-action-macro.cpp
+          src/macro-core/macro-action-macro.hpp
+          src/macro-core/macro-action-media.cpp
+          src/macro-core/macro-action-media.hpp
+          src/macro-core/macro-action-plugin-state.cpp
+          src/macro-core/macro-action-plugin-state.hpp
+          src/macro-core/macro-action-profile.cpp
+          src/macro-core/macro-action-profile.hpp
+          src/macro-core/macro-action-random.cpp
+          src/macro-core/macro-action-random.hpp
+          src/macro-core/macro-action-recording.cpp
+          src/macro-core/macro-action-recording.hpp
+          src/macro-core/macro-action-replay-buffer.cpp
+          src/macro-core/macro-action-replay-buffer.hpp
+          src/macro-core/macro-action-run.cpp
+          src/macro-core/macro-action-run.hpp
+          src/macro-core/macro-action-scene-collection.cpp
+          src/macro-core/macro-action-scene-collection.hpp
+          src/macro-core/macro-action-scene-order.cpp
+          src/macro-core/macro-action-scene-order.hpp
+          src/macro-core/macro-action-scene-switch.cpp
+          src/macro-core/macro-action-scene-switch.hpp
+          src/macro-core/macro-action-scene-transform.cpp
+          src/macro-core/macro-action-scene-transform.hpp
+          src/macro-core/macro-action-scene-visibility.cpp
+          src/macro-core/macro-action-scene-visibility.hpp
+          src/macro-core/macro-action-screenshot.cpp
+          src/macro-core/macro-action-screenshot.hpp
+          src/macro-core/macro-action-sequence.cpp
+          src/macro-core/macro-action-sequence.hpp
+          src/macro-core/macro-action-source.cpp
+          src/macro-core/macro-action-source.hpp
+          src/macro-core/macro-action-streaming.cpp
+          src/macro-core/macro-action-streaming.hpp
+          src/macro-core/macro-action-studio-mode.cpp
+          src/macro-core/macro-action-studio-mode.hpp
+          src/macro-core/macro-action-systray.cpp
+          src/macro-core/macro-action-systray.hpp
+          src/macro-core/macro-action-timer.cpp
+          src/macro-core/macro-action-timer.hpp
+          src/macro-core/macro-action-transition.cpp
+          src/macro-core/macro-action-transition.hpp
+          src/macro-core/macro-action-virtual-cam.cpp
+          src/macro-core/macro-action-virtual-cam.hpp
+          src/macro-core/macro-action-wait.cpp
+          src/macro-core/macro-action-wait.hpp
+          src/macro-core/macro-action.cpp
+          src/macro-core/macro-action.hpp
+          src/macro-core/macro-condition-audio.cpp
+          src/macro-core/macro-condition-audio.hpp
+          src/macro-core/macro-condition-cursor.cpp
+          src/macro-core/macro-condition-cursor.hpp
+          src/macro-core/macro-condition-date.cpp
+          src/macro-core/macro-condition-date.hpp
+          src/macro-core/macro-condition-edit.cpp
+          src/macro-core/macro-condition-edit.hpp
+          src/macro-core/macro-condition-file.cpp
+          src/macro-core/macro-condition-file.hpp
+          src/macro-core/macro-condition-filter.cpp
+          src/macro-core/macro-condition-filter.hpp
+          src/macro-core/macro-condition-hotkey.cpp
+          src/macro-core/macro-condition-hotkey.hpp
+          src/macro-core/macro-condition-idle.cpp
+          src/macro-core/macro-condition-idle.hpp
+          src/macro-core/macro-condition-macro.cpp
+          src/macro-core/macro-condition-macro.hpp
+          src/macro-core/macro-condition-media.cpp
+          src/macro-core/macro-condition-media.hpp
+          src/macro-core/macro-condition-obs-stats.cpp
+          src/macro-core/macro-condition-obs-stats.hpp
+          src/macro-core/macro-condition-plugin-state.cpp
+          src/macro-core/macro-condition-plugin-state.hpp
+          src/macro-core/macro-condition-process.cpp
+          src/macro-core/macro-condition-process.hpp
+          src/macro-core/macro-condition-profile.cpp
+          src/macro-core/macro-condition-profile.hpp
+          src/macro-core/macro-condition-recording.cpp
+          src/macro-core/macro-condition-recording.hpp
+          src/macro-core/macro-condition-replay-buffer.cpp
+          src/macro-core/macro-condition-replay-buffer.hpp
+          src/macro-core/macro-condition-scene-order.cpp
+          src/macro-core/macro-condition-scene-order.hpp
+          src/macro-core/macro-condition-scene-transform.cpp
+          src/macro-core/macro-condition-scene-transform.hpp
+          src/macro-core/macro-condition-scene-visibility.cpp
+          src/macro-core/macro-condition-scene-visibility.hpp
+          src/macro-core/macro-condition-scene.cpp
+          src/macro-core/macro-condition-scene.hpp
+          src/macro-core/macro-condition-source.cpp
+          src/macro-core/macro-condition-source.hpp
+          src/macro-core/macro-condition-streaming.cpp
+          src/macro-core/macro-condition-streaming.hpp
+          src/macro-core/macro-condition-studio-mode.cpp
+          src/macro-core/macro-condition-studio-mode.hpp
+          src/macro-core/macro-condition-timer.cpp
+          src/macro-core/macro-condition-timer.hpp
+          src/macro-core/macro-condition-transition.cpp
+          src/macro-core/macro-condition-transition.hpp
+          src/macro-core/macro-condition-virtual-cam.cpp
+          src/macro-core/macro-condition-virtual-cam.hpp
+          src/macro-core/macro-condition-window.cpp
+          src/macro-core/macro-condition-window.hpp
+          src/macro-core/macro-condition.cpp
+          src/macro-core/macro-condition.hpp
+          src/macro-core/macro-list-entry-widget.cpp
+          src/macro-core/macro-list-entry-widget.hpp
+          src/macro-core/macro-properties.cpp
+          src/macro-core/macro-properties.hpp
+          src/macro-core/macro-ref.cpp
+          src/macro-core/macro-ref.hpp
+          src/macro-core/macro-segment-list.cpp
+          src/macro-core/macro-segment-list.hpp
+          src/macro-core/macro-segment.cpp
+          src/macro-core/macro-segment.hpp
+          src/macro-core/macro-selection.cpp
+          src/macro-core/macro-selection.hpp
+          src/macro-core/macro-tab.cpp
+          src/macro-core/macro.cpp
+          src/macro-core/macro.hpp)
+
+# Utility function sources
+target_sources(
+  ${LIB_NAME}
+  PRIVATE src/utils/curl-helper.cpp
+          src/utils/curl-helper.hpp
+          src/utils/duration-control.cpp
+          src/utils/duration-control.hpp
+          src/utils/file-selection.cpp
+          src/utils/file-selection.hpp
+          src/utils/name-dialog.cpp
+          src/utils/name-dialog.hpp
+          src/utils/resizing-text-edit.cpp
+          src/utils/resizing-text-edit.hpp
+          src/utils/scene-item-selection.cpp
+          src/utils/scene-item-selection.hpp
+          src/utils/scene-selection.cpp
+          src/utils/scene-selection.hpp
+          src/utils/screenshot-helper.cpp
+          src/utils/screenshot-helper.hpp
+          src/utils/section.cpp
+          src/utils/section.hpp
+          src/utils/transition-selection.cpp
+          src/utils/transition-selection.hpp
+          src/utils/utility.cpp
+          src/utils/utility.hpp
+          src/utils/volume-control.cpp
+          src/utils/volume-control.hpp)
+
+# --- End of section ---
 
 if(BUILD_OUT_OF_TREE)
   find_package(libobs REQUIRED)
@@ -250,8 +269,12 @@ include(cmake/AdvSSHelpers.cmake)
 # --- Platform-independent build settings ---
 
 target_include_directories(
-  ${LIB_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src"
-                      "${CMAKE_CURRENT_BINARY_DIR}/forms")
+  ${LIB_NAME}
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src"
+          "${CMAKE_CURRENT_SOURCE_DIR}/src/legacy"
+          "${CMAKE_CURRENT_SOURCE_DIR}/src/macro-core"
+          "${CMAKE_CURRENT_SOURCE_DIR}/src/utils"
+          "${CMAKE_CURRENT_BINARY_DIR}/forms")
 
 set_target_properties(
   ${LIB_NAME}
@@ -381,4 +404,4 @@ endif()
 
 # --- End of section ---
 
-add_subdirectory(src/external-macro-modules)
+add_subdirectory(src/macro-external)
diff --git a/cmake/AdvSSHelpers.cmake b/cmake/AdvSSHelpers.cmake
index ca120a6e..c9569e16 100644
--- a/cmake/AdvSSHelpers.cmake
+++ b/cmake/AdvSSHelpers.cmake
@@ -246,8 +246,11 @@ function(setup_advss_plugin target)
   endforeach()
 
   # General includes
-  target_include_directories(${target}
-                             PRIVATE "${ADVSS_SOURCE_DIR}/src/headers")
+  target_include_directories(
+    ${target}
+    PRIVATE "${ADVSS_SOURCE_DIR}/src" "${ADVSS_SOURCE_DIR}/src/legacy"
+            "${ADVSS_SOURCE_DIR}/src/macro-core"
+            "${ADVSS_SOURCE_DIR}/src/utils" "${ADVSS_SOURCE_DIR}/forms")
 endfunction()
 
 function(install_advss_plugin_dependency)
diff --git a/cmake/version.cpp.in b/cmake/version.cpp.in
index fdd5224e..b65ba484 100644
--- a/cmake/version.cpp.in
+++ b/cmake/version.cpp.in
@@ -1,4 +1,4 @@
-#include "headers/version.h"
+#include "version.h"
 #define GIT_SHA1 "@GIT_SHA1@"
 #define GIT_TAG "@GIT_TAG@"
 const char g_GIT_SHA1[] = GIT_SHA1;
diff --git a/deps/opencv b/deps/opencv
index ad6e8294..b0dc4741 160000
--- a/deps/opencv
+++ b/deps/opencv
@@ -1 +1 @@
-Subproject commit ad6e82942b37be8ee2c71c1d9bc7fe79cd16f7ab
+Subproject commit b0dc474160e389b9c9045da5db49d03ae17c6a6b
diff --git a/src/advanced-scene-switcher.cpp b/src/advanced-scene-switcher.cpp
index 83e8b494..161df01f 100644
--- a/src/advanced-scene-switcher.cpp
+++ b/src/advanced-scene-switcher.cpp
@@ -8,11 +8,11 @@
 #include <obs-module.h>
 #include <obs-frontend-api.h>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/status-control.hpp"
-#include "headers/curl-helper.hpp"
-#include "headers/utility.hpp"
-#include "headers/version.h"
+#include "advanced-scene-switcher.hpp"
+#include "status-control.hpp"
+#include "curl-helper.hpp"
+#include "utility.hpp"
+#include "version.h"
 
 const char *obs_module_text(const char *text)
 {
diff --git a/src/headers/advanced-scene-switcher.hpp b/src/advanced-scene-switcher.hpp
similarity index 99%
rename from src/headers/advanced-scene-switcher.hpp
rename to src/advanced-scene-switcher.hpp
index 0407c98f..b078090d 100644
--- a/src/headers/advanced-scene-switcher.hpp
+++ b/src/advanced-scene-switcher.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "macro-segment-list.hpp"
 #include "switcher-data-structs.hpp"
 #include "platform-funcs.hpp"
 
+#include <macro-segment-list.hpp>
 #include <ui_advanced-scene-switcher.h>
 
 #define blog(level, msg, ...) blog(level, "[adv-ss] " msg, ##__VA_ARGS__)
diff --git a/src/general.cpp b/src/general.cpp
index 8c78e618..2ab7255b 100644
--- a/src/general.cpp
+++ b/src/general.cpp
@@ -1,7 +1,7 @@
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/status-control.hpp"
-#include "headers/utility.hpp"
-#include "headers/version.h"
+#include "advanced-scene-switcher.hpp"
+#include "status-control.hpp"
+#include "utility.hpp"
+#include "version.h"
 
 #include <QFileDialog>
 #include <QStandardPaths>
diff --git a/src/hotkey.cpp b/src/hotkey.cpp
index 989232a4..cf010579 100644
--- a/src/hotkey.cpp
+++ b/src/hotkey.cpp
@@ -1,5 +1,5 @@
-#include "headers/hotkey.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "hotkey.hpp"
+#include "advanced-scene-switcher.hpp"
 #include <obs-module.h>
 #include <fstream>
 #include <regex>
diff --git a/src/headers/hotkey.hpp b/src/hotkey.hpp
similarity index 100%
rename from src/headers/hotkey.hpp
rename to src/hotkey.hpp
diff --git a/src/scene-trigger.cpp b/src/legacy/scene-trigger.cpp
similarity index 99%
rename from src/scene-trigger.cpp
rename to src/legacy/scene-trigger.cpp
index bbffd7c1..4fa6c861 100644
--- a/src/scene-trigger.cpp
+++ b/src/legacy/scene-trigger.cpp
@@ -1,7 +1,7 @@
 #include <thread>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 bool SceneTrigger::pause = false;
 static QMetaObject::Connection addPulse;
diff --git a/src/headers/scene-trigger.hpp b/src/legacy/scene-trigger.hpp
similarity index 100%
rename from src/headers/scene-trigger.hpp
rename to src/legacy/scene-trigger.hpp
diff --git a/src/switch-audio.cpp b/src/legacy/switch-audio.cpp
similarity index 99%
rename from src/switch-audio.cpp
rename to src/legacy/switch-audio.cpp
index bbb2a55a..cb6b7366 100644
--- a/src/switch-audio.cpp
+++ b/src/legacy/switch-audio.cpp
@@ -1,8 +1,8 @@
 #include <float.h>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/volume-control.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "volume-control.hpp"
+#include "utility.hpp"
 
 bool AudioSwitch::pause = false;
 static QMetaObject::Connection addPulse;
diff --git a/src/headers/switch-audio.hpp b/src/legacy/switch-audio.hpp
similarity index 100%
rename from src/headers/switch-audio.hpp
rename to src/legacy/switch-audio.hpp
diff --git a/src/switch-executable.cpp b/src/legacy/switch-executable.cpp
similarity index 98%
rename from src/switch-executable.cpp
rename to src/legacy/switch-executable.cpp
index 134fa7cc..8b6dc1c8 100644
--- a/src/switch-executable.cpp
+++ b/src/legacy/switch-executable.cpp
@@ -1,5 +1,5 @@
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 bool ExecutableSwitch::pause = false;
 static QMetaObject::Connection addPulse;
diff --git a/src/headers/switch-executable.hpp b/src/legacy/switch-executable.hpp
similarity index 100%
rename from src/headers/switch-executable.hpp
rename to src/legacy/switch-executable.hpp
diff --git a/src/switch-file.cpp b/src/legacy/switch-file.cpp
similarity index 99%
rename from src/switch-file.cpp
rename to src/legacy/switch-file.cpp
index 55eeb025..c57ceb8d 100644
--- a/src/switch-file.cpp
+++ b/src/legacy/switch-file.cpp
@@ -6,9 +6,9 @@
 #include <regex>
 #include <curl/curl.h>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/curl-helper.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "curl-helper.hpp"
+#include "utility.hpp"
 
 bool FileSwitch::pause = false;
 static QMetaObject::Connection addPulse;
diff --git a/src/headers/switch-file.hpp b/src/legacy/switch-file.hpp
similarity index 100%
rename from src/headers/switch-file.hpp
rename to src/legacy/switch-file.hpp
diff --git a/src/switch-generic.cpp b/src/legacy/switch-generic.cpp
similarity index 98%
rename from src/switch-generic.cpp
rename to src/legacy/switch-generic.cpp
index d7f4568b..09d49599 100644
--- a/src/switch-generic.cpp
+++ b/src/legacy/switch-generic.cpp
@@ -1,5 +1,5 @@
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 static inline bool SceneGroupValid(SceneGroup *group)
 {
diff --git a/src/headers/switch-generic.hpp b/src/legacy/switch-generic.hpp
similarity index 100%
rename from src/headers/switch-generic.hpp
rename to src/legacy/switch-generic.hpp
diff --git a/src/switch-idle.cpp b/src/legacy/switch-idle.cpp
similarity index 98%
rename from src/switch-idle.cpp
rename to src/legacy/switch-idle.cpp
index 85622e3c..c0326c17 100644
--- a/src/switch-idle.cpp
+++ b/src/legacy/switch-idle.cpp
@@ -1,7 +1,7 @@
 #include <regex>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 bool IdleData::pause = false;
 IdleWidget *idleWidget = nullptr;
diff --git a/src/headers/switch-idle.hpp b/src/legacy/switch-idle.hpp
similarity index 100%
rename from src/headers/switch-idle.hpp
rename to src/legacy/switch-idle.hpp
diff --git a/src/switch-media.cpp b/src/legacy/switch-media.cpp
similarity index 99%
rename from src/switch-media.cpp
rename to src/legacy/switch-media.cpp
index 206d8483..5c6eee03 100644
--- a/src/switch-media.cpp
+++ b/src/legacy/switch-media.cpp
@@ -1,5 +1,5 @@
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 bool MediaSwitch::pause = false;
 static QMetaObject::Connection addPulse;
diff --git a/src/headers/switch-media.hpp b/src/legacy/switch-media.hpp
similarity index 100%
rename from src/headers/switch-media.hpp
rename to src/legacy/switch-media.hpp
diff --git a/src/switch-network.cpp b/src/legacy/switch-network.cpp
similarity index 99%
rename from src/switch-network.cpp
rename to src/legacy/switch-network.cpp
index b132eabf..7c100c11 100644
--- a/src/switch-network.cpp
+++ b/src/legacy/switch-network.cpp
@@ -6,8 +6,8 @@ Most of this code is based on https://github.com/Palakis/obs-websocket
 #include <QTime>
 #include <QMessageBox>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 #define PARAM_SERVER_ENABLE "ServerEnabled"
 #define PARAM_SERVER_PORT "ServerPort"
diff --git a/src/headers/switch-network.hpp b/src/legacy/switch-network.hpp
similarity index 100%
rename from src/headers/switch-network.hpp
rename to src/legacy/switch-network.hpp
diff --git a/src/switch-pause.cpp b/src/legacy/switch-pause.cpp
similarity index 99%
rename from src/switch-pause.cpp
rename to src/legacy/switch-pause.cpp
index 0514f69f..fcbf62b3 100644
--- a/src/switch-pause.cpp
+++ b/src/legacy/switch-pause.cpp
@@ -1,7 +1,7 @@
 #include <regex>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 static QMetaObject::Connection addPulse;
 
diff --git a/src/headers/switch-pause.hpp b/src/legacy/switch-pause.hpp
similarity index 100%
rename from src/headers/switch-pause.hpp
rename to src/legacy/switch-pause.hpp
diff --git a/src/switch-priority.cpp b/src/legacy/switch-priority.cpp
similarity index 97%
rename from src/switch-priority.cpp
rename to src/legacy/switch-priority.cpp
index 4f5f7422..2f456b3c 100644
--- a/src/switch-priority.cpp
+++ b/src/legacy/switch-priority.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 
-#include "headers/advanced-scene-switcher.hpp"
+#include "advanced-scene-switcher.hpp"
 
 void AdvSceneSwitcher::on_threadPriority_currentTextChanged(const QString &text)
 {
diff --git a/src/switch-random.cpp b/src/legacy/switch-random.cpp
similarity index 98%
rename from src/switch-random.cpp
rename to src/legacy/switch-random.cpp
index 87c779de..96b18b33 100644
--- a/src/switch-random.cpp
+++ b/src/legacy/switch-random.cpp
@@ -1,7 +1,7 @@
 #include <random>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 bool RandomSwitch::pause = false;
 static QMetaObject::Connection addPulse;
diff --git a/src/headers/switch-random.hpp b/src/legacy/switch-random.hpp
similarity index 100%
rename from src/headers/switch-random.hpp
rename to src/legacy/switch-random.hpp
diff --git a/src/switch-screen-region.cpp b/src/legacy/switch-screen-region.cpp
similarity index 99%
rename from src/switch-screen-region.cpp
rename to src/legacy/switch-screen-region.cpp
index 7bf9f7c8..5f9d4c26 100644
--- a/src/switch-screen-region.cpp
+++ b/src/legacy/switch-screen-region.cpp
@@ -1,7 +1,7 @@
 #include <QTimer>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 bool ScreenRegionSwitch::pause = false;
 static QMetaObject::Connection addPulse;
diff --git a/src/headers/switch-screen-region.hpp b/src/legacy/switch-screen-region.hpp
similarity index 100%
rename from src/headers/switch-screen-region.hpp
rename to src/legacy/switch-screen-region.hpp
diff --git a/src/switch-sequence.cpp b/src/legacy/switch-sequence.cpp
similarity index 99%
rename from src/switch-sequence.cpp
rename to src/legacy/switch-sequence.cpp
index 41925159..bfa1137d 100644
--- a/src/switch-sequence.cpp
+++ b/src/legacy/switch-sequence.cpp
@@ -2,8 +2,8 @@
 #include <QTextStream>
 #include <QScrollArea>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 constexpr auto max_extend_text_size = 150;
 
diff --git a/src/headers/switch-sequence.hpp b/src/legacy/switch-sequence.hpp
similarity index 100%
rename from src/headers/switch-sequence.hpp
rename to src/legacy/switch-sequence.hpp
diff --git a/src/switch-time.cpp b/src/legacy/switch-time.cpp
similarity index 98%
rename from src/switch-time.cpp
rename to src/legacy/switch-time.cpp
index 1e643ff7..6fe80e3c 100644
--- a/src/switch-time.cpp
+++ b/src/legacy/switch-time.cpp
@@ -1,5 +1,5 @@
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 bool TimeSwitch::pause = false;
 static QMetaObject::Connection addPulse;
diff --git a/src/headers/switch-time.hpp b/src/legacy/switch-time.hpp
similarity index 100%
rename from src/headers/switch-time.hpp
rename to src/legacy/switch-time.hpp
diff --git a/src/switch-transitions.cpp b/src/legacy/switch-transitions.cpp
similarity index 99%
rename from src/switch-transitions.cpp
rename to src/legacy/switch-transitions.cpp
index 6f6bd024..0c65f79f 100644
--- a/src/switch-transitions.cpp
+++ b/src/legacy/switch-transitions.cpp
@@ -1,7 +1,7 @@
 #include <thread>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 constexpr auto default_def_transition_dealy = 300;
 bool DefaultSceneTransition::pause = false;
diff --git a/src/headers/switch-transitions.hpp b/src/legacy/switch-transitions.hpp
similarity index 100%
rename from src/headers/switch-transitions.hpp
rename to src/legacy/switch-transitions.hpp
diff --git a/src/switch-video.cpp b/src/legacy/switch-video.cpp
similarity index 99%
rename from src/switch-video.cpp
rename to src/legacy/switch-video.cpp
index 0552ebab..99ad2c10 100644
--- a/src/switch-video.cpp
+++ b/src/legacy/switch-video.cpp
@@ -3,8 +3,8 @@
 #include <QToolTip>
 #include <thread>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 bool VideoSwitch::pause = false;
 static QMetaObject::Connection addPulse;
diff --git a/src/headers/switch-video.hpp b/src/legacy/switch-video.hpp
similarity index 100%
rename from src/headers/switch-video.hpp
rename to src/legacy/switch-video.hpp
diff --git a/src/switch-window.cpp b/src/legacy/switch-window.cpp
similarity index 99%
rename from src/switch-window.cpp
rename to src/legacy/switch-window.cpp
index 6727e197..c796483e 100644
--- a/src/switch-window.cpp
+++ b/src/legacy/switch-window.cpp
@@ -1,7 +1,7 @@
 #include <regex>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 bool WindowSwitch::pause = false;
 static QMetaObject::Connection addPulse;
diff --git a/src/headers/switch-window.hpp b/src/legacy/switch-window.hpp
similarity index 100%
rename from src/headers/switch-window.hpp
rename to src/legacy/switch-window.hpp
diff --git a/src/linux/advanced-scene-switcher-nix.cpp b/src/linux/advanced-scene-switcher-nix.cpp
index feff37b3..a233eb12 100644
--- a/src/linux/advanced-scene-switcher-nix.cpp
+++ b/src/linux/advanced-scene-switcher-nix.cpp
@@ -1,4 +1,4 @@
-#include "../headers/hotkey.hpp"
+#include "platform-funcs.hpp"
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
diff --git a/src/macro-condition-weekday.cpp b/src/macro-condition-weekday.cpp
deleted file mode 100644
index 7707a0c8..00000000
--- a/src/macro-condition-weekday.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-date.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-
-const std::string MacroConditionDate::id = "date";
-
-bool MacroConditionDate::_registered = MacroConditionFactory::Register(
-	MacroConditionDate::id,
-	{MacroConditionDate::Create, MacroConditionDateEdit::Create,
-	 "AdvSceneSwitcher.condition.date", false});
-
-static std::map<DateCondition, std::string> dateConditionTypes = {
-	{DateCondition::AT, "AdvSceneSwitcher.condition.date.state.at"},
-	{DateCondition::AFTER, "AdvSceneSwitcher.condition.date.state.after"},
-	{DateCondition::BEFORE, "AdvSceneSwitcher.condition.date.state.before"},
-	{DateCondition::BETWEEN,
-	 "AdvSceneSwitcher.condition.date.state.between"},
-};
-
-bool MacroConditionDate::CheckCondition()
-{
-	bool match = false;
-	QDateTime cur = QDateTime::currentDateTime();
-	if (_ignoreDate) {
-		_dateTime.setDate(cur.date());
-		_dateTime2.setDate(cur.date());
-	}
-	if (_ignoreTime) {
-		_dateTime.setTime(cur.time());
-		_dateTime2.setTime(cur.time());
-	}
-
-	switch (_condition) {
-	case DateCondition::AT:
-		match = _dateTime >= cur &&
-			_dateTime <= cur.addMSecs(switcher->interval);
-		break;
-	case DateCondition::AFTER:
-		match = cur >= _dateTime;
-		break;
-	case DateCondition::BEFORE:
-		match = cur <= _dateTime;
-		break;
-	case DateCondition::BETWEEN:
-		if (_dateTime2 > _dateTime) {
-			match = cur >= _dateTime && cur <= _dateTime2;
-		} else {
-			match = cur >= _dateTime2 && cur <= _dateTime;
-		}
-		break;
-	default:
-		break;
-	}
-
-	if (match && _repeat) {
-		_dateTime = _dateTime.addSecs(_duration.seconds);
-		_dateTime2 = _dateTime2.addSecs(_duration.seconds);
-	}
-
-	return match;
-}
-
-bool MacroConditionDate::Save(obs_data_t *obj)
-{
-	MacroCondition::Save(obj);
-	obs_data_set_int(obj, "condition", static_cast<int>(_condition));
-	obs_data_set_string(obj, "dateTime",
-			    _dateTime.toString().toStdString().c_str());
-	obs_data_set_string(obj, "dateTime2",
-			    _dateTime2.toString().toStdString().c_str());
-	obs_data_set_bool(obj, "ignoreDate", _ignoreDate);
-	obs_data_set_bool(obj, "ignoreTime", _ignoreTime);
-	obs_data_set_bool(obj, "repeat", _repeat);
-	_duration.Save(obj);
-
-	return true;
-}
-
-bool MacroConditionDate::Load(obs_data_t *obj)
-{
-	MacroCondition::Load(obj);
-	_condition =
-		static_cast<DateCondition>(obs_data_get_int(obj, "condition"));
-	_dateTime = QDateTime::fromString(
-		QString::fromStdString(obs_data_get_string(obj, "dateTime")));
-	_dateTime2 = QDateTime::fromString(
-		QString::fromStdString(obs_data_get_string(obj, "dateTime2")));
-	_ignoreDate = obs_data_get_bool(obj, "ignoreDate");
-	_ignoreTime = obs_data_get_bool(obj, "ignoreTime");
-	_repeat = obs_data_get_bool(obj, "repeat");
-	_duration.Load(obj);
-	return true;
-}
-
-std::string MacroConditionDate::GetShortDesc()
-{
-	return _dateTime.toString().toStdString();
-}
-
-static inline void populateConditionSelection(QComboBox *list)
-{
-	for (auto entry : dateConditionTypes) {
-		list->addItem(obs_module_text(entry.second.c_str()));
-	}
-}
-
-#include <QCalendarWidget>
-
-MacroConditionDateEdit::MacroConditionDateEdit(
-	QWidget *parent, std::shared_ptr<MacroConditionDate> entryData)
-	: QWidget(parent)
-{
-	_condition = new QComboBox();
-	_date = new QDateEdit();
-	_date->setDisplayFormat("yyyy.MM.dd ");
-	_date->setCalendarPopup(true);
-	auto cal = _date->calendarWidget();
-	cal->showSelectedDate();
-	_time = new QTimeEdit();
-	_time->setDisplayFormat("hh:mm:ss");
-	_separator = new QLabel(
-		obs_module_text("AdvSceneSwitcher.condition.date.separator"));
-	_date2 = new QDateEdit();
-	_date2->setDisplayFormat("yyyy.MM.dd ");
-	_date2->setCalendarPopup(true);
-	cal = _date2->calendarWidget();
-	cal->showSelectedDate();
-	_time2 = new QTimeEdit();
-	_time2->setDisplayFormat("hh:mm:ss");
-	_ignoreDate = new QCheckBox();
-	_ignoreDate->setToolTip(
-		obs_module_text("AdvSceneSwitcher.condition.date.ignoreDate"));
-	_ignoreTime = new QCheckBox();
-	_ignoreTime->setToolTip(
-		obs_module_text("AdvSceneSwitcher.condition.date.ignoreTime"));
-	_repeat = new QCheckBox();
-	_duration = new DurationSelection();
-
-	QWidget::connect(_condition, SIGNAL(currentIndexChanged(int)), this,
-			 SLOT(ConditionChanged(int)));
-	QWidget::connect(_date, SIGNAL(dateChanged(const QDate &)), this,
-			 SLOT(DateChanged(const QDate &)));
-	QWidget::connect(_date2, SIGNAL(dateChanged(const QDate &)), this,
-			 SLOT(Date2Changed(const QDate &)));
-	QWidget::connect(_time, SIGNAL(timeChanged(const QTime &)), this,
-			 SLOT(TimeChanged(const QTime &)));
-	QWidget::connect(_time2, SIGNAL(timeChanged(const QTime &)), this,
-			 SLOT(Time2Changed(const QTime &)));
-	QWidget::connect(_ignoreDate, SIGNAL(stateChanged(int)), this,
-			 SLOT(IgnoreDateChanged(int)));
-	QWidget::connect(_ignoreTime, SIGNAL(stateChanged(int)), this,
-			 SLOT(IgnoreTimeChanged(int)));
-	QWidget::connect(_repeat, SIGNAL(stateChanged(int)), this,
-			 SLOT(RepeatChanged(int)));
-	QWidget::connect(_duration, SIGNAL(DurationChanged(double)), this,
-			 SLOT(DurationChanged(double)));
-	QWidget::connect(_duration, SIGNAL(UnitChanged(DurationUnit)), this,
-			 SLOT(DurationUnitChanged(DurationUnit)));
-
-	populateConditionSelection(_condition);
-
-	auto line1Layout = new QHBoxLayout;
-	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
-		{"{{condition}}", _condition},
-		{"{{date}}", _date},
-		{"{{time}}", _time},
-		{"{{separator}}", _separator},
-		{"{{date2}}", _date2},
-		{"{{time2}}", _time2},
-		{"{{ignoreDate}}", _ignoreDate},
-		{"{{ignoreTime}}", _ignoreTime},
-		{"{{repeat}}", _repeat},
-		{"{{duration}}", _duration},
-	};
-	placeWidgets(
-		obs_module_text("AdvSceneSwitcher.condition.date.entry.line1"),
-		line1Layout, widgetPlaceholders);
-	auto line2Layout = new QHBoxLayout;
-	placeWidgets(
-		obs_module_text("AdvSceneSwitcher.condition.date.entry.line2"),
-		line2Layout, widgetPlaceholders);
-
-	auto *mainLayout = new QVBoxLayout;
-	mainLayout->addLayout(line1Layout);
-	mainLayout->addLayout(line2Layout);
-	setLayout(mainLayout);
-
-	_entryData = entryData;
-	UpdateEntryData();
-	_loading = false;
-}
-
-void MacroConditionDateEdit::ConditionChanged(int cond)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_condition = static_cast<DateCondition>(cond);
-	ShowSecondDateSelection(_entryData->_condition ==
-				DateCondition::BETWEEN);
-}
-
-void MacroConditionDateEdit::DateChanged(const QDate &date)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_dateTime.setDate(date);
-
-	emit HeaderInfoChanged(
-		QString::fromStdString(_entryData->GetShortDesc()));
-}
-
-void MacroConditionDateEdit::TimeChanged(const QTime &time)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_dateTime.setTime(time);
-
-	emit HeaderInfoChanged(
-		QString::fromStdString(_entryData->GetShortDesc()));
-}
-
-void MacroConditionDateEdit::Date2Changed(const QDate &date)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_dateTime2.setDate(date);
-}
-
-void MacroConditionDateEdit::Time2Changed(const QTime &time)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_dateTime2.setTime(time);
-}
-
-void MacroConditionDateEdit::IgnoreDateChanged(int state)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_ignoreDate = !state;
-	SetWidgetStatus();
-}
-
-void MacroConditionDateEdit::IgnoreTimeChanged(int state)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_ignoreTime = !state;
-	SetWidgetStatus();
-}
-
-void MacroConditionDateEdit::RepeatChanged(int state)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_repeat = state;
-	_duration->setDisabled(!state);
-}
-
-void MacroConditionDateEdit::DurationChanged(double seconds)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_duration.seconds = seconds;
-}
-
-void MacroConditionDateEdit::DurationUnitChanged(DurationUnit unit)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_duration.displayUnit = unit;
-}
-
-void MacroConditionDateEdit::UpdateEntryData()
-{
-	if (!_entryData) {
-		return;
-	}
-
-	_condition->setCurrentIndex(static_cast<int>(_entryData->_condition));
-	_date->setDate(_entryData->_dateTime.date());
-	_time->setTime(_entryData->_dateTime.time());
-	_date2->setDate(_entryData->_dateTime2.date());
-	_time2->setTime(_entryData->_dateTime2.time());
-	_ignoreDate->setChecked(!_entryData->_ignoreDate);
-	_ignoreTime->setChecked(!_entryData->_ignoreTime);
-	_repeat->setChecked(_entryData->_repeat);
-	_duration->SetDuration(_entryData->_duration);
-	_duration->setDisabled(!_entryData->_repeat);
-	SetWidgetStatus();
-}
-
-void MacroConditionDateEdit::SetWidgetStatus()
-{
-	if (!_entryData) {
-		return;
-	}
-
-	_date->setDisabled(_entryData->_ignoreDate);
-	_date2->setDisabled(_entryData->_ignoreDate);
-	_time->setDisabled(_entryData->_ignoreTime);
-	_time2->setDisabled(_entryData->_ignoreTime);
-	ShowSecondDateSelection(_entryData->_condition ==
-				DateCondition::BETWEEN);
-}
-
-void MacroConditionDateEdit::ShowSecondDateSelection(bool visible)
-{
-	_separator->setVisible(visible);
-	_date2->setVisible(visible);
-	_time2->setVisible(visible);
-	adjustSize();
-}
diff --git a/src/macro-action-audio.cpp b/src/macro-core/macro-action-audio.cpp
similarity index 99%
rename from src/macro-action-audio.cpp
rename to src/macro-core/macro-action-audio.cpp
index e134c078..5ac9453d 100644
--- a/src/macro-action-audio.cpp
+++ b/src/macro-core/macro-action-audio.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-audio.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-audio.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionAudio::id = "audio";
 
diff --git a/src/headers/macro-action-audio.hpp b/src/macro-core/macro-action-audio.hpp
similarity index 100%
rename from src/headers/macro-action-audio.hpp
rename to src/macro-core/macro-action-audio.hpp
diff --git a/src/macro-action-edit.cpp b/src/macro-core/macro-action-edit.cpp
similarity index 93%
rename from src/macro-action-edit.cpp
rename to src/macro-core/macro-action-edit.cpp
index 15de914d..2261936f 100644
--- a/src/macro-action-edit.cpp
+++ b/src/macro-core/macro-action-edit.cpp
@@ -1,15 +1,19 @@
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/macro-action-edit.hpp"
-#include "headers/macro-action-scene-switch.hpp"
-#include "headers/section.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "macro-action-edit.hpp"
+#include "macro-action-scene-switch.hpp"
+#include "section.hpp"
+#include "utility.hpp"
 
-std::map<std::string, MacroActionInfo> MacroActionFactory::_methods;
+std::map<std::string, MacroActionInfo> &MacroActionFactory::GetMap()
+{
+	static std::map<std::string, MacroActionInfo> _methods;
+	return _methods;
+}
 
 bool MacroActionFactory::Register(const std::string &id, MacroActionInfo info)
 {
-	if (auto it = _methods.find(id); it == _methods.end()) {
-		_methods[id] = info;
+	if (auto it = GetMap().find(id); it == GetMap().end()) {
+		GetMap()[id] = info;
 		return true;
 	}
 	return false;
@@ -18,7 +22,7 @@ bool MacroActionFactory::Register(const std::string &id, MacroActionInfo info)
 std::shared_ptr<MacroAction> MacroActionFactory::Create(const std::string &id,
 							Macro *m)
 {
-	if (auto it = _methods.find(id); it != _methods.end())
+	if (auto it = GetMap().find(id); it != GetMap().end())
 		return it->second._createFunc(m);
 
 	return nullptr;
@@ -28,7 +32,7 @@ QWidget *MacroActionFactory::CreateWidget(const std::string &id,
 					  QWidget *parent,
 					  std::shared_ptr<MacroAction> action)
 {
-	if (auto it = _methods.find(id); it != _methods.end())
+	if (auto it = GetMap().find(id); it != GetMap().end())
 		return it->second._createWidgetFunc(parent, action);
 
 	return nullptr;
@@ -36,7 +40,7 @@ QWidget *MacroActionFactory::CreateWidget(const std::string &id,
 
 std::string MacroActionFactory::GetActionName(const std::string &id)
 {
-	if (auto it = _methods.find(id); it != _methods.end()) {
+	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._name;
 	}
 	return "unknown action";
@@ -44,7 +48,7 @@ std::string MacroActionFactory::GetActionName(const std::string &id)
 
 std::string MacroActionFactory::GetIdByName(const QString &name)
 {
-	for (auto it : _methods) {
+	for (auto it : GetMap()) {
 		if (name == obs_module_text(it.second._name.c_str())) {
 			return it.first;
 		}
diff --git a/src/headers/macro-action-edit.hpp b/src/macro-core/macro-action-edit.hpp
similarity index 92%
rename from src/headers/macro-action-edit.hpp
rename to src/macro-core/macro-action-edit.hpp
index 404aad9d..bfb838db 100644
--- a/src/headers/macro-action-edit.hpp
+++ b/src/macro-core/macro-action-edit.hpp
@@ -16,17 +16,18 @@ struct MacroActionInfo {
 class MacroActionFactory {
 public:
 	MacroActionFactory() = delete;
+
 	static bool Register(const std::string &id, MacroActionInfo);
 	static std::shared_ptr<MacroAction> Create(const std::string &id,
 						   Macro *m);
 	static QWidget *CreateWidget(const std::string &id, QWidget *parent,
 				     std::shared_ptr<MacroAction> action);
-	static auto GetActionTypes() { return _methods; }
+	static auto GetActionTypes() { return GetMap(); }
 	static std::string GetActionName(const std::string &id);
 	static std::string GetIdByName(const QString &name);
 
 private:
-	static std::map<std::string, MacroActionInfo> _methods;
+	static std::map<std::string, MacroActionInfo> &GetMap();
 };
 
 class MacroActionEdit : public MacroSegmentEdit {
diff --git a/src/macro-action-file.cpp b/src/macro-core/macro-action-file.cpp
similarity index 97%
rename from src/macro-action-file.cpp
rename to src/macro-core/macro-action-file.cpp
index bcfde7a9..7c451a70 100644
--- a/src/macro-action-file.cpp
+++ b/src/macro-core/macro-action-file.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-file.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-file.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 #include <QFile>
 #include <QTextStream>
diff --git a/src/headers/macro-action-file.hpp b/src/macro-core/macro-action-file.hpp
similarity index 100%
rename from src/headers/macro-action-file.hpp
rename to src/macro-core/macro-action-file.hpp
diff --git a/src/macro-action-filter.cpp b/src/macro-core/macro-action-filter.cpp
similarity index 98%
rename from src/macro-action-filter.cpp
rename to src/macro-core/macro-action-filter.cpp
index b121c667..847fa84a 100644
--- a/src/macro-action-filter.cpp
+++ b/src/macro-core/macro-action-filter.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-filter.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-filter.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionFilter::id = "filter";
 
diff --git a/src/headers/macro-action-filter.hpp b/src/macro-core/macro-action-filter.hpp
similarity index 100%
rename from src/headers/macro-action-filter.hpp
rename to src/macro-core/macro-action-filter.hpp
diff --git a/src/macro-action-hotkey.cpp b/src/macro-core/macro-action-hotkey.cpp
similarity index 99%
rename from src/macro-action-hotkey.cpp
rename to src/macro-core/macro-action-hotkey.cpp
index 20d513ed..1d509b1e 100644
--- a/src/macro-action-hotkey.cpp
+++ b/src/macro-core/macro-action-hotkey.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-hotkey.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-hotkey.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 #include <obs-interaction.h>
 
 const std::string MacroActionHotkey::id = "hotkey";
diff --git a/src/headers/macro-action-hotkey.hpp b/src/macro-core/macro-action-hotkey.hpp
similarity index 100%
rename from src/headers/macro-action-hotkey.hpp
rename to src/macro-core/macro-action-hotkey.hpp
diff --git a/src/macro-action-macro.cpp b/src/macro-core/macro-action-macro.cpp
similarity index 97%
rename from src/macro-action-macro.cpp
rename to src/macro-core/macro-action-macro.cpp
index 0a8b0b39..36b3cf80 100644
--- a/src/macro-action-macro.cpp
+++ b/src/macro-core/macro-action-macro.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-macro.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-macro.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionMacro::id = "macro";
 
diff --git a/src/headers/macro-action-macro.hpp b/src/macro-core/macro-action-macro.hpp
similarity index 100%
rename from src/headers/macro-action-macro.hpp
rename to src/macro-core/macro-action-macro.hpp
diff --git a/src/macro-action-media.cpp b/src/macro-core/macro-action-media.cpp
similarity index 97%
rename from src/macro-action-media.cpp
rename to src/macro-core/macro-action-media.cpp
index af0392d6..b882b58d 100644
--- a/src/macro-action-media.cpp
+++ b/src/macro-core/macro-action-media.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-media.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-media.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionMedia::id = "media";
 
diff --git a/src/headers/macro-action-media.hpp b/src/macro-core/macro-action-media.hpp
similarity index 100%
rename from src/headers/macro-action-media.hpp
rename to src/macro-core/macro-action-media.hpp
diff --git a/src/macro-action-plugin-state.cpp b/src/macro-core/macro-action-plugin-state.cpp
similarity index 98%
rename from src/macro-action-plugin-state.cpp
rename to src/macro-core/macro-action-plugin-state.cpp
index a0d0dd3a..5243fdef 100644
--- a/src/macro-action-plugin-state.cpp
+++ b/src/macro-core/macro-action-plugin-state.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-plugin-state.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-plugin-state.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 #include <thread>
 
diff --git a/src/headers/macro-action-plugin-state.hpp b/src/macro-core/macro-action-plugin-state.hpp
similarity index 100%
rename from src/headers/macro-action-plugin-state.hpp
rename to src/macro-core/macro-action-plugin-state.hpp
diff --git a/src/macro-action-profile.cpp b/src/macro-core/macro-action-profile.cpp
similarity index 94%
rename from src/macro-action-profile.cpp
rename to src/macro-core/macro-action-profile.cpp
index 1847971c..58220dc9 100644
--- a/src/macro-action-profile.cpp
+++ b/src/macro-core/macro-action-profile.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-profile.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-profile.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionProfile::id = "profile";
 
diff --git a/src/headers/macro-action-profile.hpp b/src/macro-core/macro-action-profile.hpp
similarity index 100%
rename from src/headers/macro-action-profile.hpp
rename to src/macro-core/macro-action-profile.hpp
diff --git a/src/macro-action-random.cpp b/src/macro-core/macro-action-random.cpp
similarity index 98%
rename from src/macro-action-random.cpp
rename to src/macro-core/macro-action-random.cpp
index 5433d4f7..489b54aa 100644
--- a/src/macro-action-random.cpp
+++ b/src/macro-core/macro-action-random.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-random.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-random.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 #include <cstdlib>
 
diff --git a/src/headers/macro-action-random.hpp b/src/macro-core/macro-action-random.hpp
similarity index 100%
rename from src/headers/macro-action-random.hpp
rename to src/macro-core/macro-action-random.hpp
diff --git a/src/macro-action-recording.cpp b/src/macro-core/macro-action-recording.cpp
similarity index 96%
rename from src/macro-action-recording.cpp
rename to src/macro-core/macro-action-recording.cpp
index 527b98b7..42c97f2f 100644
--- a/src/macro-action-recording.cpp
+++ b/src/macro-core/macro-action-recording.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-recording.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-recording.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionRecord::id = "recording";
 
diff --git a/src/headers/macro-action-recording.hpp b/src/macro-core/macro-action-recording.hpp
similarity index 100%
rename from src/headers/macro-action-recording.hpp
rename to src/macro-core/macro-action-recording.hpp
diff --git a/src/macro-action-replay-buffer.cpp b/src/macro-core/macro-action-replay-buffer.cpp
similarity index 96%
rename from src/macro-action-replay-buffer.cpp
rename to src/macro-core/macro-action-replay-buffer.cpp
index 0c76a9a1..107801fe 100644
--- a/src/macro-action-replay-buffer.cpp
+++ b/src/macro-core/macro-action-replay-buffer.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-replay-buffer.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-replay-buffer.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionReplayBuffer::id = "replay_buffer";
 
diff --git a/src/headers/macro-action-replay-buffer.hpp b/src/macro-core/macro-action-replay-buffer.hpp
similarity index 100%
rename from src/headers/macro-action-replay-buffer.hpp
rename to src/macro-core/macro-action-replay-buffer.hpp
diff --git a/src/macro-action-run.cpp b/src/macro-core/macro-action-run.cpp
similarity index 97%
rename from src/macro-action-run.cpp
rename to src/macro-core/macro-action-run.cpp
index 9bb7c625..66bf700e 100644
--- a/src/macro-action-run.cpp
+++ b/src/macro-core/macro-action-run.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-action-run.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/name-dialog.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-run.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "name-dialog.hpp"
+#include "utility.hpp"
 
 #include <QProcess>
 #include <QFileDialog>
diff --git a/src/headers/macro-action-run.hpp b/src/macro-core/macro-action-run.hpp
similarity index 100%
rename from src/headers/macro-action-run.hpp
rename to src/macro-core/macro-action-run.hpp
diff --git a/src/macro-action-scene-collection.cpp b/src/macro-core/macro-action-scene-collection.cpp
similarity index 96%
rename from src/macro-action-scene-collection.cpp
rename to src/macro-core/macro-action-scene-collection.cpp
index 170e1eb9..024c22ed 100644
--- a/src/macro-action-scene-collection.cpp
+++ b/src/macro-core/macro-action-scene-collection.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-scene-collection.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-scene-collection.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionSceneCollection::id = "scene_collection";
 
diff --git a/src/headers/macro-action-scene-collection.hpp b/src/macro-core/macro-action-scene-collection.hpp
similarity index 100%
rename from src/headers/macro-action-scene-collection.hpp
rename to src/macro-core/macro-action-scene-collection.hpp
diff --git a/src/macro-action-scene-order.cpp b/src/macro-core/macro-action-scene-order.cpp
similarity index 98%
rename from src/macro-action-scene-order.cpp
rename to src/macro-core/macro-action-scene-order.cpp
index 9cff6434..4a73b8be 100644
--- a/src/macro-action-scene-order.cpp
+++ b/src/macro-core/macro-action-scene-order.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-scene-order.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-scene-order.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionSceneOrder::id = "scene_order";
 
diff --git a/src/headers/macro-action-scene-order.hpp b/src/macro-core/macro-action-scene-order.hpp
similarity index 100%
rename from src/headers/macro-action-scene-order.hpp
rename to src/macro-core/macro-action-scene-order.hpp
diff --git a/src/macro-action-scene-switch.cpp b/src/macro-core/macro-action-scene-switch.cpp
similarity index 98%
rename from src/macro-action-scene-switch.cpp
rename to src/macro-core/macro-action-scene-switch.cpp
index 607e6d78..c116d6ce 100644
--- a/src/macro-action-scene-switch.cpp
+++ b/src/macro-core/macro-action-scene-switch.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-scene-switch.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-scene-switch.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 using namespace std::chrono_literals;
 
diff --git a/src/headers/macro-action-scene-switch.hpp b/src/macro-core/macro-action-scene-switch.hpp
similarity index 100%
rename from src/headers/macro-action-scene-switch.hpp
rename to src/macro-core/macro-action-scene-switch.hpp
diff --git a/src/macro-action-scene-transform.cpp b/src/macro-core/macro-action-scene-transform.cpp
similarity index 97%
rename from src/macro-action-scene-transform.cpp
rename to src/macro-core/macro-action-scene-transform.cpp
index ae994e18..5f82cddf 100644
--- a/src/macro-action-scene-transform.cpp
+++ b/src/macro-core/macro-action-scene-transform.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-scene-transform.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-scene-transform.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionSceneTransform::id = "scene_transform";
 
diff --git a/src/headers/macro-action-scene-transform.hpp b/src/macro-core/macro-action-scene-transform.hpp
similarity index 100%
rename from src/headers/macro-action-scene-transform.hpp
rename to src/macro-core/macro-action-scene-transform.hpp
diff --git a/src/macro-action-scene-visibility.cpp b/src/macro-core/macro-action-scene-visibility.cpp
similarity index 98%
rename from src/macro-action-scene-visibility.cpp
rename to src/macro-core/macro-action-scene-visibility.cpp
index 80002352..c87450d1 100644
--- a/src/macro-action-scene-visibility.cpp
+++ b/src/macro-core/macro-action-scene-visibility.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-scene-visibility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-scene-visibility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionSceneVisibility::id = "scene_visibility";
 
diff --git a/src/headers/macro-action-scene-visibility.hpp b/src/macro-core/macro-action-scene-visibility.hpp
similarity index 100%
rename from src/headers/macro-action-scene-visibility.hpp
rename to src/macro-core/macro-action-scene-visibility.hpp
diff --git a/src/macro-action-screenshot.cpp b/src/macro-core/macro-action-screenshot.cpp
similarity index 95%
rename from src/macro-action-screenshot.cpp
rename to src/macro-core/macro-action-screenshot.cpp
index 97a1f8af..8ab0c5d2 100644
--- a/src/macro-action-screenshot.cpp
+++ b/src/macro-core/macro-action-screenshot.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-screenshot.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-screenshot.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionScreenshot::id = "screenshot";
 
diff --git a/src/headers/macro-action-screenshot.hpp b/src/macro-core/macro-action-screenshot.hpp
similarity index 100%
rename from src/headers/macro-action-screenshot.hpp
rename to src/macro-core/macro-action-screenshot.hpp
diff --git a/src/macro-action-sequence.cpp b/src/macro-core/macro-action-sequence.cpp
similarity index 98%
rename from src/macro-action-sequence.cpp
rename to src/macro-core/macro-action-sequence.cpp
index 03cdcb35..02ca09ec 100644
--- a/src/macro-action-sequence.cpp
+++ b/src/macro-core/macro-action-sequence.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-sequence.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-sequence.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionSequence::id = "sequence";
 
diff --git a/src/headers/macro-action-sequence.hpp b/src/macro-core/macro-action-sequence.hpp
similarity index 100%
rename from src/headers/macro-action-sequence.hpp
rename to src/macro-core/macro-action-sequence.hpp
diff --git a/src/macro-action-source.cpp b/src/macro-core/macro-action-source.cpp
similarity index 98%
rename from src/macro-action-source.cpp
rename to src/macro-core/macro-action-source.cpp
index 3517483b..4e1985df 100644
--- a/src/macro-action-source.cpp
+++ b/src/macro-core/macro-action-source.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-source.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-source.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionSource::id = "source";
 
diff --git a/src/headers/macro-action-source.hpp b/src/macro-core/macro-action-source.hpp
similarity index 100%
rename from src/headers/macro-action-source.hpp
rename to src/macro-core/macro-action-source.hpp
diff --git a/src/macro-action-streaming.cpp b/src/macro-core/macro-action-streaming.cpp
similarity index 96%
rename from src/macro-action-streaming.cpp
rename to src/macro-core/macro-action-streaming.cpp
index 8aef172d..1d335018 100644
--- a/src/macro-action-streaming.cpp
+++ b/src/macro-core/macro-action-streaming.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-streaming.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-streaming.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionStream::id = "streaming";
 
diff --git a/src/headers/macro-action-streaming.hpp b/src/macro-core/macro-action-streaming.hpp
similarity index 100%
rename from src/headers/macro-action-streaming.hpp
rename to src/macro-core/macro-action-streaming.hpp
diff --git a/src/macro-action-studio-mode.cpp b/src/macro-core/macro-action-studio-mode.cpp
similarity index 97%
rename from src/macro-action-studio-mode.cpp
rename to src/macro-core/macro-action-studio-mode.cpp
index 8579dbef..e4db3fe1 100644
--- a/src/macro-action-studio-mode.cpp
+++ b/src/macro-core/macro-action-studio-mode.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-studio-mode.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-studio-mode.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionSudioMode::id = "studio_mode";
 
diff --git a/src/headers/macro-action-studio-mode.hpp b/src/macro-core/macro-action-studio-mode.hpp
similarity index 100%
rename from src/headers/macro-action-studio-mode.hpp
rename to src/macro-core/macro-action-studio-mode.hpp
diff --git a/src/macro-action-systray.cpp b/src/macro-core/macro-action-systray.cpp
similarity index 93%
rename from src/macro-action-systray.cpp
rename to src/macro-core/macro-action-systray.cpp
index 00a3f2d0..1616077e 100644
--- a/src/macro-action-systray.cpp
+++ b/src/macro-core/macro-action-systray.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-systray.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-systray.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionSystray::id = "systray_notification";
 
diff --git a/src/headers/macro-action-systray.hpp b/src/macro-core/macro-action-systray.hpp
similarity index 100%
rename from src/headers/macro-action-systray.hpp
rename to src/macro-core/macro-action-systray.hpp
diff --git a/src/macro-action-timer.cpp b/src/macro-core/macro-action-timer.cpp
similarity index 97%
rename from src/macro-action-timer.cpp
rename to src/macro-core/macro-action-timer.cpp
index 8de6cb23..623215d9 100644
--- a/src/macro-action-timer.cpp
+++ b/src/macro-core/macro-action-timer.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-action-timer.hpp"
-#include "headers/macro-condition-timer.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-timer.hpp"
+#include "macro-condition-timer.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 #include <random>
 
diff --git a/src/headers/macro-action-timer.hpp b/src/macro-core/macro-action-timer.hpp
similarity index 100%
rename from src/headers/macro-action-timer.hpp
rename to src/macro-core/macro-action-timer.hpp
diff --git a/src/macro-action-transition.cpp b/src/macro-core/macro-action-transition.cpp
similarity index 98%
rename from src/macro-action-transition.cpp
rename to src/macro-core/macro-action-transition.cpp
index f07fd2f2..268f1ef2 100644
--- a/src/macro-action-transition.cpp
+++ b/src/macro-core/macro-action-transition.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-transition.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-transition.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionTransition::id = "transition";
 
diff --git a/src/headers/macro-action-transition.hpp b/src/macro-core/macro-action-transition.hpp
similarity index 100%
rename from src/headers/macro-action-transition.hpp
rename to src/macro-core/macro-action-transition.hpp
diff --git a/src/macro-action-virtual-cam.cpp b/src/macro-core/macro-action-virtual-cam.cpp
similarity index 95%
rename from src/macro-action-virtual-cam.cpp
rename to src/macro-core/macro-action-virtual-cam.cpp
index 28bd7a5c..14843791 100644
--- a/src/macro-action-virtual-cam.cpp
+++ b/src/macro-core/macro-action-virtual-cam.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-virtual-cam.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-virtual-cam.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 const std::string MacroActionVCam::id = "virtual_cam";
 
diff --git a/src/headers/macro-action-virtual-cam.hpp b/src/macro-core/macro-action-virtual-cam.hpp
similarity index 100%
rename from src/headers/macro-action-virtual-cam.hpp
rename to src/macro-core/macro-action-virtual-cam.hpp
diff --git a/src/macro-action-wait.cpp b/src/macro-core/macro-action-wait.cpp
similarity index 97%
rename from src/macro-action-wait.cpp
rename to src/macro-core/macro-action-wait.cpp
index 989f1ebe..838f849b 100644
--- a/src/macro-action-wait.cpp
+++ b/src/macro-core/macro-action-wait.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-action-wait.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-action-wait.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 #include <random>
 
diff --git a/src/headers/macro-action-wait.hpp b/src/macro-core/macro-action-wait.hpp
similarity index 100%
rename from src/headers/macro-action-wait.hpp
rename to src/macro-core/macro-action-wait.hpp
diff --git a/src/macro-action.cpp b/src/macro-core/macro-action.cpp
similarity index 85%
rename from src/macro-action.cpp
rename to src/macro-core/macro-action.cpp
index d5027227..7584ed56 100644
--- a/src/macro-action.cpp
+++ b/src/macro-core/macro-action.cpp
@@ -1,5 +1,5 @@
-#include "headers/macro-action.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-action.hpp"
+#include "advanced-scene-switcher.hpp"
 
 bool MacroAction::Save(obs_data_t *obj)
 {
diff --git a/src/headers/macro-action.hpp b/src/macro-core/macro-action.hpp
similarity index 100%
rename from src/headers/macro-action.hpp
rename to src/macro-core/macro-action.hpp
diff --git a/src/macro-condition-audio.cpp b/src/macro-core/macro-condition-audio.cpp
similarity index 98%
rename from src/macro-condition-audio.cpp
rename to src/macro-core/macro-condition-audio.cpp
index 4241fe47..17c24973 100644
--- a/src/macro-condition-audio.cpp
+++ b/src/macro-core/macro-condition-audio.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-audio.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-audio.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionAudio::id = "audio";
 
diff --git a/src/headers/macro-condition-audio.hpp b/src/macro-core/macro-condition-audio.hpp
similarity index 100%
rename from src/headers/macro-condition-audio.hpp
rename to src/macro-core/macro-condition-audio.hpp
diff --git a/src/macro-condition-cursor.cpp b/src/macro-core/macro-condition-cursor.cpp
similarity index 97%
rename from src/macro-condition-cursor.cpp
rename to src/macro-core/macro-condition-cursor.cpp
index 80d9a59f..bf06ba4a 100644
--- a/src/macro-condition-cursor.cpp
+++ b/src/macro-core/macro-condition-cursor.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-cursor.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-cursor.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionCursor::id = "cursor";
 
diff --git a/src/headers/macro-condition-cursor.hpp b/src/macro-core/macro-condition-cursor.hpp
similarity index 100%
rename from src/headers/macro-condition-cursor.hpp
rename to src/macro-core/macro-condition-cursor.hpp
diff --git a/src/macro-condition-date.cpp b/src/macro-core/macro-condition-date.cpp
similarity index 99%
rename from src/macro-condition-date.cpp
rename to src/macro-core/macro-condition-date.cpp
index fb0a3a9e..fbf4fa35 100644
--- a/src/macro-condition-date.cpp
+++ b/src/macro-core/macro-condition-date.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-date.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-date.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 #include <QCalendarWidget>
 
diff --git a/src/headers/macro-condition-date.hpp b/src/macro-core/macro-condition-date.hpp
similarity index 100%
rename from src/headers/macro-condition-date.hpp
rename to src/macro-core/macro-condition-date.hpp
diff --git a/src/macro-condition-edit.cpp b/src/macro-core/macro-condition-edit.cpp
similarity index 95%
rename from src/macro-condition-edit.cpp
rename to src/macro-core/macro-condition-edit.cpp
index f1596fe8..29224164 100644
--- a/src/macro-condition-edit.cpp
+++ b/src/macro-core/macro-condition-edit.cpp
@@ -1,16 +1,20 @@
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-scene.hpp"
-#include "headers/section.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-scene.hpp"
+#include "section.hpp"
+#include "utility.hpp"
 
-std::map<std::string, MacroConditionInfo> MacroConditionFactory::_methods;
+std::map<std::string, MacroConditionInfo> &MacroConditionFactory::GetMap()
+{
+	static std::map<std::string, MacroConditionInfo> _methods;
+	return _methods;
+}
 
 bool MacroConditionFactory::Register(const std::string &id,
 				     MacroConditionInfo info)
 {
-	if (auto it = _methods.find(id); it == _methods.end()) {
-		_methods[id] = info;
+	if (auto it = GetMap().find(id); it == GetMap().end()) {
+		GetMap()[id] = info;
 		return true;
 	}
 	return false;
@@ -19,7 +23,7 @@ bool MacroConditionFactory::Register(const std::string &id,
 std::shared_ptr<MacroCondition>
 MacroConditionFactory::Create(const std::string &id, Macro *m)
 {
-	if (auto it = _methods.find(id); it != _methods.end()) {
+	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._createFunc(m);
 	}
 	return nullptr;
@@ -29,7 +33,7 @@ QWidget *
 MacroConditionFactory::CreateWidget(const std::string &id, QWidget *parent,
 				    std::shared_ptr<MacroCondition> cond)
 {
-	if (auto it = _methods.find(id); it != _methods.end()) {
+	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._createWidgetFunc(parent, cond);
 	}
 	return nullptr;
@@ -37,7 +41,7 @@ MacroConditionFactory::CreateWidget(const std::string &id, QWidget *parent,
 
 std::string MacroConditionFactory::GetConditionName(const std::string &id)
 {
-	if (auto it = _methods.find(id); it != _methods.end()) {
+	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._name;
 	}
 	return "unknown condition";
@@ -45,7 +49,7 @@ std::string MacroConditionFactory::GetConditionName(const std::string &id)
 
 std::string MacroConditionFactory::GetIdByName(const QString &name)
 {
-	for (auto it : _methods) {
+	for (auto it : GetMap()) {
 		if (name == obs_module_text(it.second._name.c_str())) {
 			return it.first;
 		}
@@ -55,7 +59,7 @@ std::string MacroConditionFactory::GetIdByName(const QString &name)
 
 bool MacroConditionFactory::UsesDurationModifier(const std::string &id)
 {
-	if (auto it = _methods.find(id); it != _methods.end()) {
+	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._useDurationModifier;
 	}
 	return false;
diff --git a/src/headers/macro-condition-edit.hpp b/src/macro-core/macro-condition-edit.hpp
similarity index 95%
rename from src/headers/macro-condition-edit.hpp
rename to src/macro-core/macro-condition-edit.hpp
index 504e31b3..5ad33ae5 100644
--- a/src/headers/macro-condition-edit.hpp
+++ b/src/macro-core/macro-condition-edit.hpp
@@ -21,13 +21,13 @@ public:
 						      Macro *m);
 	static QWidget *CreateWidget(const std::string &id, QWidget *parent,
 				     std::shared_ptr<MacroCondition>);
-	static auto GetConditionTypes() { return _methods; }
+	static auto GetConditionTypes() { return GetMap(); }
 	static std::string GetConditionName(const std::string &);
 	static std::string GetIdByName(const QString &name);
 	static bool UsesDurationModifier(const std::string &id);
 
 private:
-	static std::map<std::string, MacroConditionInfo> _methods;
+	static std::map<std::string, MacroConditionInfo> &GetMap();
 };
 
 class DurationModifierEdit : public QWidget {
diff --git a/src/macro-condition-file.cpp b/src/macro-core/macro-condition-file.cpp
similarity index 97%
rename from src/macro-condition-file.cpp
rename to src/macro-core/macro-condition-file.cpp
index 8db98d62..77b02616 100644
--- a/src/macro-condition-file.cpp
+++ b/src/macro-core/macro-condition-file.cpp
@@ -1,8 +1,8 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-file.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/curl-helper.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-file.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "curl-helper.hpp"
 
 #include <QTextStream>
 #include <QFileDialog>
diff --git a/src/headers/macro-condition-file.hpp b/src/macro-core/macro-condition-file.hpp
similarity index 100%
rename from src/headers/macro-condition-file.hpp
rename to src/macro-core/macro-condition-file.hpp
diff --git a/src/macro-condition-filter.cpp b/src/macro-core/macro-condition-filter.cpp
similarity index 97%
rename from src/macro-condition-filter.cpp
rename to src/macro-core/macro-condition-filter.cpp
index 5287a1df..492f901e 100644
--- a/src/macro-condition-filter.cpp
+++ b/src/macro-core/macro-condition-filter.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-filter.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-filter.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
diff --git a/src/headers/macro-condition-filter.hpp b/src/macro-core/macro-condition-filter.hpp
similarity index 100%
rename from src/headers/macro-condition-filter.hpp
rename to src/macro-core/macro-condition-filter.hpp
diff --git a/src/macro-condition-hotkey.cpp b/src/macro-core/macro-condition-hotkey.cpp
similarity index 95%
rename from src/macro-condition-hotkey.cpp
rename to src/macro-core/macro-condition-hotkey.cpp
index 1fee4cfc..5becfd26 100644
--- a/src/macro-condition-hotkey.cpp
+++ b/src/macro-core/macro-condition-hotkey.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-hotkey.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-hotkey.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionHotkey::id = "hotkey";
 
diff --git a/src/headers/macro-condition-hotkey.hpp b/src/macro-core/macro-condition-hotkey.hpp
similarity index 100%
rename from src/headers/macro-condition-hotkey.hpp
rename to src/macro-core/macro-condition-hotkey.hpp
diff --git a/src/macro-condition-idle.cpp b/src/macro-core/macro-condition-idle.cpp
similarity index 91%
rename from src/macro-condition-idle.cpp
rename to src/macro-core/macro-condition-idle.cpp
index 79fdad57..0d34babd 100644
--- a/src/macro-condition-idle.cpp
+++ b/src/macro-core/macro-condition-idle.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-idle.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-idle.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionIdle::id = "idle";
 
diff --git a/src/headers/macro-condition-idle.hpp b/src/macro-core/macro-condition-idle.hpp
similarity index 100%
rename from src/headers/macro-condition-idle.hpp
rename to src/macro-core/macro-condition-idle.hpp
diff --git a/src/macro-condition-macro.cpp b/src/macro-core/macro-condition-macro.cpp
similarity index 98%
rename from src/macro-condition-macro.cpp
rename to src/macro-core/macro-condition-macro.cpp
index a671ff17..30c83e7f 100644
--- a/src/macro-condition-macro.cpp
+++ b/src/macro-core/macro-condition-macro.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-macro.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-macro.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionMacro::id = "macro";
 
diff --git a/src/headers/macro-condition-macro.hpp b/src/macro-core/macro-condition-macro.hpp
similarity index 100%
rename from src/headers/macro-condition-macro.hpp
rename to src/macro-core/macro-condition-macro.hpp
diff --git a/src/macro-condition-media.cpp b/src/macro-core/macro-condition-media.cpp
similarity index 99%
rename from src/macro-condition-media.cpp
rename to src/macro-core/macro-condition-media.cpp
index 06164c70..347c7b9d 100644
--- a/src/macro-condition-media.cpp
+++ b/src/macro-core/macro-condition-media.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-media.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-media.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionMedia::id = "media";
 
diff --git a/src/headers/macro-condition-media.hpp b/src/macro-core/macro-condition-media.hpp
similarity index 100%
rename from src/headers/macro-condition-media.hpp
rename to src/macro-core/macro-condition-media.hpp
diff --git a/src/macro-condition-obs-stats.cpp b/src/macro-core/macro-condition-obs-stats.cpp
similarity index 98%
rename from src/macro-condition-obs-stats.cpp
rename to src/macro-core/macro-condition-obs-stats.cpp
index c8d96eb0..508c22f1 100644
--- a/src/macro-condition-obs-stats.cpp
+++ b/src/macro-core/macro-condition-obs-stats.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-obs-stats.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-obs-stats.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionStats::id = "obs_stats";
 
diff --git a/src/headers/macro-condition-obs-stats.hpp b/src/macro-core/macro-condition-obs-stats.hpp
similarity index 100%
rename from src/headers/macro-condition-obs-stats.hpp
rename to src/macro-core/macro-condition-obs-stats.hpp
diff --git a/src/macro-condition-plugin-state.cpp b/src/macro-core/macro-condition-plugin-state.cpp
similarity index 94%
rename from src/macro-condition-plugin-state.cpp
rename to src/macro-core/macro-condition-plugin-state.cpp
index c24298eb..0f019037 100644
--- a/src/macro-condition-plugin-state.cpp
+++ b/src/macro-core/macro-condition-plugin-state.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-plugin-state.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-plugin-state.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionPluginState::id = "plugin_state";
 
diff --git a/src/headers/macro-condition-plugin-state.hpp b/src/macro-core/macro-condition-plugin-state.hpp
similarity index 100%
rename from src/headers/macro-condition-plugin-state.hpp
rename to src/macro-core/macro-condition-plugin-state.hpp
diff --git a/src/macro-condition-process.cpp b/src/macro-core/macro-condition-process.cpp
similarity index 94%
rename from src/macro-condition-process.cpp
rename to src/macro-core/macro-condition-process.cpp
index b2e796cd..5a5f484e 100644
--- a/src/macro-condition-process.cpp
+++ b/src/macro-core/macro-condition-process.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-process.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-process.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
diff --git a/src/headers/macro-condition-process.hpp b/src/macro-core/macro-condition-process.hpp
similarity index 100%
rename from src/headers/macro-condition-process.hpp
rename to src/macro-core/macro-condition-process.hpp
diff --git a/src/macro-condition-profile.cpp b/src/macro-core/macro-condition-profile.cpp
similarity index 92%
rename from src/macro-condition-profile.cpp
rename to src/macro-core/macro-condition-profile.cpp
index 5c0cbfbc..8c542b00 100644
--- a/src/macro-condition-profile.cpp
+++ b/src/macro-core/macro-condition-profile.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-profile.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-profile.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionProfile::id = "profile";
 
diff --git a/src/headers/macro-condition-profile.hpp b/src/macro-core/macro-condition-profile.hpp
similarity index 100%
rename from src/headers/macro-condition-profile.hpp
rename to src/macro-core/macro-condition-profile.hpp
diff --git a/src/macro-condition-recording.cpp b/src/macro-core/macro-condition-recording.cpp
similarity index 93%
rename from src/macro-condition-recording.cpp
rename to src/macro-core/macro-condition-recording.cpp
index 38c40a64..9718c42d 100644
--- a/src/macro-condition-recording.cpp
+++ b/src/macro-core/macro-condition-recording.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-recording.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-recording.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionRecord::id = "recording";
 
diff --git a/src/headers/macro-condition-recording.hpp b/src/macro-core/macro-condition-recording.hpp
similarity index 100%
rename from src/headers/macro-condition-recording.hpp
rename to src/macro-core/macro-condition-recording.hpp
diff --git a/src/macro-condition-replay-buffer.cpp b/src/macro-core/macro-condition-replay-buffer.cpp
similarity index 93%
rename from src/macro-condition-replay-buffer.cpp
rename to src/macro-core/macro-condition-replay-buffer.cpp
index e5d39806..51127a95 100644
--- a/src/macro-condition-replay-buffer.cpp
+++ b/src/macro-core/macro-condition-replay-buffer.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-replay-buffer.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-replay-buffer.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionReplayBuffer::id = "replay_buffer";
 
diff --git a/src/headers/macro-condition-replay-buffer.hpp b/src/macro-core/macro-condition-replay-buffer.hpp
similarity index 100%
rename from src/headers/macro-condition-replay-buffer.hpp
rename to src/macro-core/macro-condition-replay-buffer.hpp
diff --git a/src/macro-condition-scene-order.cpp b/src/macro-core/macro-condition-scene-order.cpp
similarity index 98%
rename from src/macro-condition-scene-order.cpp
rename to src/macro-core/macro-condition-scene-order.cpp
index 1f13b104..59494239 100644
--- a/src/macro-condition-scene-order.cpp
+++ b/src/macro-core/macro-condition-scene-order.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-scene-order.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-scene-order.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionSceneOrder::id = "scene_order";
 
diff --git a/src/headers/macro-condition-scene-order.hpp b/src/macro-core/macro-condition-scene-order.hpp
similarity index 100%
rename from src/headers/macro-condition-scene-order.hpp
rename to src/macro-core/macro-condition-scene-order.hpp
diff --git a/src/macro-condition-scene-transform.cpp b/src/macro-core/macro-condition-scene-transform.cpp
similarity index 96%
rename from src/macro-condition-scene-transform.cpp
rename to src/macro-core/macro-condition-scene-transform.cpp
index bd922f4d..85adf64e 100644
--- a/src/macro-condition-scene-transform.cpp
+++ b/src/macro-core/macro-condition-scene-transform.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-scene-transform.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-scene-transform.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionSceneTransform::id = "scene_transform";
 
diff --git a/src/headers/macro-condition-scene-transform.hpp b/src/macro-core/macro-condition-scene-transform.hpp
similarity index 100%
rename from src/headers/macro-condition-scene-transform.hpp
rename to src/macro-core/macro-condition-scene-transform.hpp
diff --git a/src/macro-condition-scene-visibility.cpp b/src/macro-core/macro-condition-scene-visibility.cpp
similarity index 96%
rename from src/macro-condition-scene-visibility.cpp
rename to src/macro-core/macro-condition-scene-visibility.cpp
index 2d070a7b..81014efc 100644
--- a/src/macro-condition-scene-visibility.cpp
+++ b/src/macro-core/macro-condition-scene-visibility.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-scene-visibility.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-scene-visibility.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
diff --git a/src/headers/macro-condition-scene-visibility.hpp b/src/macro-core/macro-condition-scene-visibility.hpp
similarity index 100%
rename from src/headers/macro-condition-scene-visibility.hpp
rename to src/macro-core/macro-condition-scene-visibility.hpp
diff --git a/src/macro-condition-scene.cpp b/src/macro-core/macro-condition-scene.cpp
similarity index 97%
rename from src/macro-condition-scene.cpp
rename to src/macro-core/macro-condition-scene.cpp
index 4bec59ff..35a7ad56 100644
--- a/src/macro-condition-scene.cpp
+++ b/src/macro-core/macro-condition-scene.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-scene.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-scene.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionScene::id = "scene";
 
diff --git a/src/headers/macro-condition-scene.hpp b/src/macro-core/macro-condition-scene.hpp
similarity index 100%
rename from src/headers/macro-condition-scene.hpp
rename to src/macro-core/macro-condition-scene.hpp
diff --git a/src/macro-condition-source.cpp b/src/macro-core/macro-condition-source.cpp
similarity index 97%
rename from src/macro-condition-source.cpp
rename to src/macro-core/macro-condition-source.cpp
index ae2c693a..ccc1de62 100644
--- a/src/macro-condition-source.cpp
+++ b/src/macro-core/macro-condition-source.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-source.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-source.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
diff --git a/src/headers/macro-condition-source.hpp b/src/macro-core/macro-condition-source.hpp
similarity index 100%
rename from src/headers/macro-condition-source.hpp
rename to src/macro-core/macro-condition-source.hpp
diff --git a/src/macro-condition-streaming.cpp b/src/macro-core/macro-condition-streaming.cpp
similarity index 94%
rename from src/macro-condition-streaming.cpp
rename to src/macro-core/macro-condition-streaming.cpp
index d6dee98f..dcf6fcd1 100644
--- a/src/macro-condition-streaming.cpp
+++ b/src/macro-core/macro-condition-streaming.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-streaming.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-streaming.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionStream::id = "streaming";
 
diff --git a/src/headers/macro-condition-streaming.hpp b/src/macro-core/macro-condition-streaming.hpp
similarity index 100%
rename from src/headers/macro-condition-streaming.hpp
rename to src/macro-core/macro-condition-streaming.hpp
diff --git a/src/macro-condition-studio-mode.cpp b/src/macro-core/macro-condition-studio-mode.cpp
similarity index 95%
rename from src/macro-condition-studio-mode.cpp
rename to src/macro-core/macro-condition-studio-mode.cpp
index be6bc537..993539ab 100644
--- a/src/macro-condition-studio-mode.cpp
+++ b/src/macro-core/macro-condition-studio-mode.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-studio-mode.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-studio-mode.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionStudioMode::id = "studio_mode";
 
diff --git a/src/headers/macro-condition-studio-mode.hpp b/src/macro-core/macro-condition-studio-mode.hpp
similarity index 100%
rename from src/headers/macro-condition-studio-mode.hpp
rename to src/macro-core/macro-condition-studio-mode.hpp
diff --git a/src/macro-condition-timer.cpp b/src/macro-core/macro-condition-timer.cpp
similarity index 98%
rename from src/macro-condition-timer.cpp
rename to src/macro-core/macro-condition-timer.cpp
index 183a3629..12e52c34 100644
--- a/src/macro-condition-timer.cpp
+++ b/src/macro-core/macro-condition-timer.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-timer.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-timer.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionTimer::id = "timer";
 
diff --git a/src/headers/macro-condition-timer.hpp b/src/macro-core/macro-condition-timer.hpp
similarity index 100%
rename from src/headers/macro-condition-timer.hpp
rename to src/macro-core/macro-condition-timer.hpp
diff --git a/src/macro-condition-transition.cpp b/src/macro-core/macro-condition-transition.cpp
similarity index 98%
rename from src/macro-condition-transition.cpp
rename to src/macro-core/macro-condition-transition.cpp
index 11e2bec2..3e67f456 100644
--- a/src/macro-condition-transition.cpp
+++ b/src/macro-core/macro-condition-transition.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-transition.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-transition.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionTransition::id = "transition";
 
diff --git a/src/headers/macro-condition-transition.hpp b/src/macro-core/macro-condition-transition.hpp
similarity index 100%
rename from src/headers/macro-condition-transition.hpp
rename to src/macro-core/macro-condition-transition.hpp
diff --git a/src/macro-condition-virtual-cam.cpp b/src/macro-core/macro-condition-virtual-cam.cpp
similarity index 92%
rename from src/macro-condition-virtual-cam.cpp
rename to src/macro-core/macro-condition-virtual-cam.cpp
index 8b8a75f9..a9f3f1e7 100644
--- a/src/macro-condition-virtual-cam.cpp
+++ b/src/macro-core/macro-condition-virtual-cam.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-virtual-cam.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-virtual-cam.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::string MacroConditionVCam::id = "virtual_cam";
 
diff --git a/src/headers/macro-condition-virtual-cam.hpp b/src/macro-core/macro-condition-virtual-cam.hpp
similarity index 100%
rename from src/headers/macro-condition-virtual-cam.hpp
rename to src/macro-core/macro-condition-virtual-cam.hpp
diff --git a/src/macro-condition-window.cpp b/src/macro-core/macro-condition-window.cpp
similarity index 97%
rename from src/macro-condition-window.cpp
rename to src/macro-core/macro-condition-window.cpp
index e0a01186..6538baf6 100644
--- a/src/macro-condition-window.cpp
+++ b/src/macro-core/macro-condition-window.cpp
@@ -1,7 +1,7 @@
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-window.hpp"
-#include "headers/utility.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-condition-window.hpp"
+#include "utility.hpp"
+#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
diff --git a/src/headers/macro-condition-window.hpp b/src/macro-core/macro-condition-window.hpp
similarity index 100%
rename from src/headers/macro-condition-window.hpp
rename to src/macro-core/macro-condition-window.hpp
diff --git a/src/macro-condition.cpp b/src/macro-core/macro-condition.cpp
similarity index 97%
rename from src/macro-condition.cpp
rename to src/macro-core/macro-condition.cpp
index 9f712561..600b167b 100644
--- a/src/macro-condition.cpp
+++ b/src/macro-core/macro-condition.cpp
@@ -1,5 +1,5 @@
-#include "headers/macro-condition.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro-condition.hpp"
+#include "advanced-scene-switcher.hpp"
 
 const std::map<LogicType, LogicTypeInfo> MacroCondition::logicTypes = {
 	{LogicType::NONE, {"AdvSceneSwitcher.logic.none"}},
diff --git a/src/headers/macro-condition.hpp b/src/macro-core/macro-condition.hpp
similarity index 98%
rename from src/headers/macro-condition.hpp
rename to src/macro-core/macro-condition.hpp
index db503956..3265b534 100644
--- a/src/headers/macro-condition.hpp
+++ b/src/macro-core/macro-condition.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "macro-segment.hpp"
 #include "macro-ref.hpp"
-#include "duration-control.hpp"
+#include <duration-control.hpp>
 
 constexpr auto logic_root_offset = 100;
 
diff --git a/src/macro-list-entry-widget.cpp b/src/macro-core/macro-list-entry-widget.cpp
similarity index 93%
rename from src/macro-list-entry-widget.cpp
rename to src/macro-core/macro-list-entry-widget.cpp
index d955b453..30adfc44 100644
--- a/src/macro-list-entry-widget.cpp
+++ b/src/macro-core/macro-list-entry-widget.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-list-entry-widget.hpp"
-#include "headers/macro.hpp"
-#include "headers/utility.hpp"
+#include "macro-list-entry-widget.hpp"
+#include "macro.hpp"
+#include "utility.hpp"
 
 MacroListEntryWidget::MacroListEntryWidget(std::shared_ptr<Macro> macro,
 					   bool highlight, QWidget *parent)
diff --git a/src/headers/macro-list-entry-widget.hpp b/src/macro-core/macro-list-entry-widget.hpp
similarity index 100%
rename from src/headers/macro-list-entry-widget.hpp
rename to src/macro-core/macro-list-entry-widget.hpp
diff --git a/src/macro-properties.cpp b/src/macro-core/macro-properties.cpp
similarity index 98%
rename from src/macro-properties.cpp
rename to src/macro-core/macro-properties.cpp
index 6e90de00..2c2cd812 100644
--- a/src/macro-properties.cpp
+++ b/src/macro-core/macro-properties.cpp
@@ -1,4 +1,4 @@
-#include "headers/macro-properties.hpp"
+#include "macro-properties.hpp"
 
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
diff --git a/src/headers/macro-properties.hpp b/src/macro-core/macro-properties.hpp
similarity index 100%
rename from src/headers/macro-properties.hpp
rename to src/macro-core/macro-properties.hpp
diff --git a/src/macro-ref.cpp b/src/macro-core/macro-ref.cpp
similarity index 90%
rename from src/macro-ref.cpp
rename to src/macro-core/macro-ref.cpp
index 2b38d639..6c35ec1c 100644
--- a/src/macro-ref.cpp
+++ b/src/macro-core/macro-ref.cpp
@@ -1,5 +1,5 @@
-#include "headers/macro-ref.hpp"
-#include "headers/macro.hpp"
+#include "macro-ref.hpp"
+#include "macro.hpp"
 
 MacroRef::MacroRef(std::string name) : _name(name)
 {
diff --git a/src/headers/macro-ref.hpp b/src/macro-core/macro-ref.hpp
similarity index 100%
rename from src/headers/macro-ref.hpp
rename to src/macro-core/macro-ref.hpp
diff --git a/src/macro-segment-list.cpp b/src/macro-core/macro-segment-list.cpp
similarity index 99%
rename from src/macro-segment-list.cpp
rename to src/macro-core/macro-segment-list.cpp
index e6b9c0b4..02bc7322 100644
--- a/src/macro-segment-list.cpp
+++ b/src/macro-core/macro-segment-list.cpp
@@ -1,5 +1,5 @@
-#include "headers/macro-segment-list.hpp"
-#include "headers/utility.hpp"
+#include "macro-segment-list.hpp"
+#include "utility.hpp"
 
 #include <QGridLayout>
 #include <QSpacerItem>
diff --git a/src/headers/macro-segment-list.hpp b/src/macro-core/macro-segment-list.hpp
similarity index 100%
rename from src/headers/macro-segment-list.hpp
rename to src/macro-core/macro-segment-list.hpp
diff --git a/src/macro-segment.cpp b/src/macro-core/macro-segment.cpp
similarity index 98%
rename from src/macro-segment.cpp
rename to src/macro-core/macro-segment.cpp
index 808a67f8..f082c1a4 100644
--- a/src/macro-segment.cpp
+++ b/src/macro-core/macro-segment.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-segment.hpp"
-#include "headers/section.hpp"
-#include "headers/utility.hpp"
+#include "macro-segment.hpp"
+#include "section.hpp"
+#include "utility.hpp"
 
 #include <obs.hpp>
 #include <QEvent>
diff --git a/src/headers/macro-segment.hpp b/src/macro-core/macro-segment.hpp
similarity index 100%
rename from src/headers/macro-segment.hpp
rename to src/macro-core/macro-segment.hpp
diff --git a/src/macro-selection.cpp b/src/macro-core/macro-selection.cpp
similarity index 96%
rename from src/macro-selection.cpp
rename to src/macro-core/macro-selection.cpp
index c3183914..d480c358 100644
--- a/src/macro-selection.cpp
+++ b/src/macro-core/macro-selection.cpp
@@ -1,6 +1,6 @@
-#include "headers/macro-selection.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "macro-selection.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 #include <QStandardItemModel>
 #include <QDialogButtonBox>
diff --git a/src/headers/macro-selection.hpp b/src/macro-core/macro-selection.hpp
similarity index 100%
rename from src/headers/macro-selection.hpp
rename to src/macro-core/macro-selection.hpp
diff --git a/src/macro-tab.cpp b/src/macro-core/macro-tab.cpp
similarity index 98%
rename from src/macro-tab.cpp
rename to src/macro-core/macro-tab.cpp
index 9b43b154..adad23db 100644
--- a/src/macro-tab.cpp
+++ b/src/macro-core/macro-tab.cpp
@@ -1,11 +1,11 @@
-#include "headers/macro.hpp"
-#include "headers/macro-list-entry-widget.hpp"
-#include "headers/macro-action-edit.hpp"
-#include "headers/macro-condition-edit.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/name-dialog.hpp"
-#include "headers/macro-properties.hpp"
-#include "headers/utility.hpp"
+#include "macro.hpp"
+#include "macro-list-entry-widget.hpp"
+#include "macro-action-edit.hpp"
+#include "macro-condition-edit.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "name-dialog.hpp"
+#include "macro-properties.hpp"
+#include "utility.hpp"
 
 #include <QColor>
 #include <QMenu>
diff --git a/src/macro.cpp b/src/macro-core/macro.cpp
similarity index 98%
rename from src/macro.cpp
rename to src/macro-core/macro.cpp
index 019ae044..5ec928ad 100644
--- a/src/macro.cpp
+++ b/src/macro-core/macro.cpp
@@ -1,8 +1,8 @@
-#include "headers/macro.hpp"
-#include "headers/macro-action-edit.hpp"
-#include "headers/macro-condition-edit.hpp"
-#include "headers/macro-action-scene-switch.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "macro.hpp"
+#include "macro-action-edit.hpp"
+#include "macro-condition-edit.hpp"
+#include "macro-action-scene-switch.hpp"
+#include "advanced-scene-switcher.hpp"
 
 #include <limits>
 #undef max
diff --git a/src/headers/macro.hpp b/src/macro-core/macro.hpp
similarity index 100%
rename from src/headers/macro.hpp
rename to src/macro-core/macro.hpp
diff --git a/src/external-macro-modules/CMakeLists.txt b/src/macro-external/CMakeLists.txt
similarity index 100%
rename from src/external-macro-modules/CMakeLists.txt
rename to src/macro-external/CMakeLists.txt
diff --git a/src/external-macro-modules/opencv/CMakeLists.txt b/src/macro-external/opencv/CMakeLists.txt
similarity index 100%
rename from src/external-macro-modules/opencv/CMakeLists.txt
rename to src/macro-external/opencv/CMakeLists.txt
diff --git a/src/external-macro-modules/opencv/area-selection.cpp b/src/macro-external/opencv/area-selection.cpp
similarity index 100%
rename from src/external-macro-modules/opencv/area-selection.cpp
rename to src/macro-external/opencv/area-selection.cpp
diff --git a/src/external-macro-modules/opencv/area-selection.hpp b/src/macro-external/opencv/area-selection.hpp
similarity index 100%
rename from src/external-macro-modules/opencv/area-selection.hpp
rename to src/macro-external/opencv/area-selection.hpp
diff --git a/src/external-macro-modules/opencv/macro-condition-video.cpp b/src/macro-external/opencv/macro-condition-video.cpp
similarity index 100%
rename from src/external-macro-modules/opencv/macro-condition-video.cpp
rename to src/macro-external/opencv/macro-condition-video.cpp
diff --git a/src/external-macro-modules/opencv/macro-condition-video.hpp b/src/macro-external/opencv/macro-condition-video.hpp
similarity index 100%
rename from src/external-macro-modules/opencv/macro-condition-video.hpp
rename to src/macro-external/opencv/macro-condition-video.hpp
diff --git a/src/external-macro-modules/opencv/opencv-helpers.cpp b/src/macro-external/opencv/opencv-helpers.cpp
similarity index 100%
rename from src/external-macro-modules/opencv/opencv-helpers.cpp
rename to src/macro-external/opencv/opencv-helpers.cpp
diff --git a/src/external-macro-modules/opencv/opencv-helpers.hpp b/src/macro-external/opencv/opencv-helpers.hpp
similarity index 100%
rename from src/external-macro-modules/opencv/opencv-helpers.hpp
rename to src/macro-external/opencv/opencv-helpers.hpp
diff --git a/src/external-macro-modules/opencv/preview-dialog.cpp b/src/macro-external/opencv/preview-dialog.cpp
similarity index 100%
rename from src/external-macro-modules/opencv/preview-dialog.cpp
rename to src/macro-external/opencv/preview-dialog.cpp
diff --git a/src/external-macro-modules/opencv/preview-dialog.hpp b/src/macro-external/opencv/preview-dialog.hpp
similarity index 100%
rename from src/external-macro-modules/opencv/preview-dialog.hpp
rename to src/macro-external/opencv/preview-dialog.hpp
diff --git a/src/external-macro-modules/opencv/threshold-slider.cpp b/src/macro-external/opencv/threshold-slider.cpp
similarity index 100%
rename from src/external-macro-modules/opencv/threshold-slider.cpp
rename to src/macro-external/opencv/threshold-slider.cpp
diff --git a/src/external-macro-modules/opencv/threshold-slider.hpp b/src/macro-external/opencv/threshold-slider.hpp
similarity index 100%
rename from src/external-macro-modules/opencv/threshold-slider.hpp
rename to src/macro-external/opencv/threshold-slider.hpp
diff --git a/src/external-macro-modules/opencv/video-selection.cpp b/src/macro-external/opencv/video-selection.cpp
similarity index 100%
rename from src/external-macro-modules/opencv/video-selection.cpp
rename to src/macro-external/opencv/video-selection.cpp
diff --git a/src/external-macro-modules/opencv/video-selection.hpp b/src/macro-external/opencv/video-selection.hpp
similarity index 100%
rename from src/external-macro-modules/opencv/video-selection.hpp
rename to src/macro-external/opencv/video-selection.hpp
diff --git a/src/external-macro-modules/openvr/CMakeLists.txt b/src/macro-external/openvr/CMakeLists.txt
similarity index 100%
rename from src/external-macro-modules/openvr/CMakeLists.txt
rename to src/macro-external/openvr/CMakeLists.txt
diff --git a/src/external-macro-modules/openvr/macro-condition-openvr.cpp b/src/macro-external/openvr/macro-condition-openvr.cpp
similarity index 100%
rename from src/external-macro-modules/openvr/macro-condition-openvr.cpp
rename to src/macro-external/openvr/macro-condition-openvr.cpp
diff --git a/src/external-macro-modules/openvr/macro-condition-openvr.hpp b/src/macro-external/openvr/macro-condition-openvr.hpp
similarity index 100%
rename from src/external-macro-modules/openvr/macro-condition-openvr.hpp
rename to src/macro-external/openvr/macro-condition-openvr.hpp
diff --git a/src/osx/advanced-scene-switcher-osx.mm b/src/osx/advanced-scene-switcher-osx.mm
index 724f59c5..73f79feb 100644
--- a/src/osx/advanced-scene-switcher-osx.mm
+++ b/src/osx/advanced-scene-switcher-osx.mm
@@ -1,4 +1,4 @@
-#include "../headers/hotkey.hpp"
+#include "platform-funcs.hpp"
 
 #import <AppKit/AppKit.h>
 #import <CoreFoundation/CoreFoundation.h>
diff --git a/src/headers/platform-funcs.hpp b/src/platform-funcs.hpp
similarity index 89%
rename from src/headers/platform-funcs.hpp
rename to src/platform-funcs.hpp
index 8c37f352..fc95dfd9 100644
--- a/src/headers/platform-funcs.hpp
+++ b/src/platform-funcs.hpp
@@ -1,6 +1,10 @@
 #pragma once
 #include "hotkey.hpp"
 
+#include <vector>
+#include <string>
+#include <QStringList>
+
 void GetWindowList(std::vector<std::string> &windows);
 void GetWindowList(QStringList &windows);
 void GetCurrentWindowTitle(std::string &title);
diff --git a/src/scene-group.cpp b/src/scene-group.cpp
index 520607f5..f59bb3e1 100644
--- a/src/scene-group.cpp
+++ b/src/scene-group.cpp
@@ -2,9 +2,9 @@
 #include <QDialogButtonBox>
 #include <random>
 
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/name-dialog.hpp"
-#include "headers/utility.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "name-dialog.hpp"
+#include "utility.hpp"
 
 static QMetaObject::Connection addPulse;
 SceneGroupEditWidget *typeEdit = nullptr;
diff --git a/src/headers/scene-group.hpp b/src/scene-group.hpp
similarity index 100%
rename from src/headers/scene-group.hpp
rename to src/scene-group.hpp
diff --git a/src/status-control.cpp b/src/status-control.cpp
index 22114d7a..55373a67 100644
--- a/src/status-control.cpp
+++ b/src/status-control.cpp
@@ -1,6 +1,6 @@
-#include "headers/status-control.hpp"
-#include "headers/advanced-scene-switcher.hpp"
-#include "headers/utility.hpp"
+#include "status-control.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "utility.hpp"
 
 #include <obs-module.h>
 #include <QMainWindow>
diff --git a/src/headers/status-control.hpp b/src/status-control.hpp
similarity index 100%
rename from src/headers/status-control.hpp
rename to src/status-control.hpp
diff --git a/src/switcher-data-structs.cpp b/src/switcher-data-structs.cpp
index bf86fefa..7044e40c 100644
--- a/src/switcher-data-structs.cpp
+++ b/src/switcher-data-structs.cpp
@@ -1,5 +1,5 @@
-#include "headers/switcher-data-structs.hpp"
-#include "headers/utility.hpp"
+#include "switcher-data-structs.hpp"
+#include "utility.hpp"
 
 void SwitcherData::Prune()
 {
diff --git a/src/headers/switcher-data-structs.hpp b/src/switcher-data-structs.hpp
similarity index 94%
rename from src/headers/switcher-data-structs.hpp
rename to src/switcher-data-structs.hpp
index 16439c39..8ad61792 100644
--- a/src/headers/switcher-data-structs.hpp
+++ b/src/switcher-data-structs.hpp
@@ -8,26 +8,26 @@
 #include <curl/curl.h>
 #include <unordered_map>
 
-#include "scene-group.hpp"
-#include "scene-trigger.hpp"
-#include "switch-audio.hpp"
-#include "switch-executable.hpp"
-#include "switch-file.hpp"
-#include "switch-idle.hpp"
-#include "switch-media.hpp"
-#include "switch-pause.hpp"
-#include "switch-random.hpp"
-#include "switch-screen-region.hpp"
-#include "switch-time.hpp"
-#include "switch-transitions.hpp"
-#include "switch-window.hpp"
-#include "switch-sequence.hpp"
-#include "switch-video.hpp"
-#include "switch-network.hpp"
+#include <scene-group.hpp>
+#include <scene-trigger.hpp>
+#include <switch-audio.hpp>
+#include <switch-executable.hpp>
+#include <switch-file.hpp>
+#include <switch-idle.hpp>
+#include <switch-media.hpp>
+#include <switch-pause.hpp>
+#include <switch-random.hpp>
+#include <switch-screen-region.hpp>
+#include <switch-time.hpp>
+#include <switch-transitions.hpp>
+#include <switch-window.hpp>
+#include <switch-sequence.hpp>
+#include <switch-video.hpp>
+#include <switch-network.hpp>
 
-#include "macro.hpp"
-#include "macro-properties.hpp"
-#include "duration-control.hpp"
+#include <macro.hpp>
+#include <macro-properties.hpp>
+#include <duration-control.hpp>
 
 constexpr auto default_interval = 300;
 constexpr auto previous_scene_name = "Previous Scene";
diff --git a/src/curl-helper.cpp b/src/utils/curl-helper.cpp
similarity index 98%
rename from src/curl-helper.cpp
rename to src/utils/curl-helper.cpp
index 87fdac71..5699de36 100644
--- a/src/curl-helper.cpp
+++ b/src/utils/curl-helper.cpp
@@ -3,7 +3,7 @@
 #include <curl/curl.h>
 #include <obs.hpp>
 
-#include "headers/curl-helper.hpp"
+#include "curl-helper.hpp"
 
 initFunction f_curl_init = nullptr;
 setOptFunction f_curl_setopt = nullptr;
diff --git a/src/headers/curl-helper.hpp b/src/utils/curl-helper.hpp
similarity index 100%
rename from src/headers/curl-helper.hpp
rename to src/utils/curl-helper.hpp
diff --git a/src/duration-control.cpp b/src/utils/duration-control.cpp
similarity index 98%
rename from src/duration-control.cpp
rename to src/utils/duration-control.cpp
index ad69f3ca..f52ca4b7 100644
--- a/src/duration-control.cpp
+++ b/src/utils/duration-control.cpp
@@ -1,5 +1,5 @@
-#include "headers/duration-control.hpp"
-#include "headers/utility.hpp"
+#include "duration-control.hpp"
+#include "utility.hpp"
 #include "obs-module.h"
 
 #include <sstream>
diff --git a/src/headers/duration-control.hpp b/src/utils/duration-control.hpp
similarity index 100%
rename from src/headers/duration-control.hpp
rename to src/utils/duration-control.hpp
diff --git a/src/file-selection.cpp b/src/utils/file-selection.cpp
similarity index 96%
rename from src/file-selection.cpp
rename to src/utils/file-selection.cpp
index 7d435e0a..086ffcfe 100644
--- a/src/file-selection.cpp
+++ b/src/utils/file-selection.cpp
@@ -1,4 +1,4 @@
-#include "headers/file-selection.hpp"
+#include "file-selection.hpp"
 
 #include <obs-module.h>
 #include <QLayout>
diff --git a/src/headers/file-selection.hpp b/src/utils/file-selection.hpp
similarity index 100%
rename from src/headers/file-selection.hpp
rename to src/utils/file-selection.hpp
diff --git a/src/name-dialog.cpp b/src/utils/name-dialog.cpp
similarity index 98%
rename from src/name-dialog.cpp
rename to src/utils/name-dialog.cpp
index cdf27bd5..91f241fe 100644
--- a/src/name-dialog.cpp
+++ b/src/utils/name-dialog.cpp
@@ -1,6 +1,6 @@
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
-#include "headers/name-dialog.hpp"
+#include "name-dialog.hpp"
 
 AdvSSNameDialog::AdvSSNameDialog(QWidget *parent) : QDialog(parent)
 {
diff --git a/src/headers/name-dialog.hpp b/src/utils/name-dialog.hpp
similarity index 100%
rename from src/headers/name-dialog.hpp
rename to src/utils/name-dialog.hpp
diff --git a/src/resizing-text-edit.cpp b/src/utils/resizing-text-edit.cpp
similarity index 94%
rename from src/resizing-text-edit.cpp
rename to src/utils/resizing-text-edit.cpp
index 2c8dc1ce..3f2c64ba 100644
--- a/src/resizing-text-edit.cpp
+++ b/src/utils/resizing-text-edit.cpp
@@ -1,4 +1,4 @@
-#include "headers/resizing-text-edit.hpp"
+#include "resizing-text-edit.hpp"
 
 ResizingPlainTextEdit::ResizingPlainTextEdit(QWidget *parent,
 					     const int scrollAt,
diff --git a/src/headers/resizing-text-edit.hpp b/src/utils/resizing-text-edit.hpp
similarity index 100%
rename from src/headers/resizing-text-edit.hpp
rename to src/utils/resizing-text-edit.hpp
diff --git a/src/scene-item-selection.cpp b/src/utils/scene-item-selection.cpp
similarity index 99%
rename from src/scene-item-selection.cpp
rename to src/utils/scene-item-selection.cpp
index a0caabcc..da2e85ce 100644
--- a/src/scene-item-selection.cpp
+++ b/src/utils/scene-item-selection.cpp
@@ -1,4 +1,4 @@
-#include "headers/scene-item-selection.hpp"
+#include "scene-item-selection.hpp"
 
 #include <obs-module.h>
 
diff --git a/src/headers/scene-item-selection.hpp b/src/utils/scene-item-selection.hpp
similarity index 100%
rename from src/headers/scene-item-selection.hpp
rename to src/utils/scene-item-selection.hpp
diff --git a/src/scene-selection.cpp b/src/utils/scene-selection.cpp
similarity index 98%
rename from src/scene-selection.cpp
rename to src/utils/scene-selection.cpp
index fe262b08..ec016cde 100644
--- a/src/scene-selection.cpp
+++ b/src/utils/scene-selection.cpp
@@ -1,5 +1,5 @@
-#include "headers/scene-selection.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "scene-selection.hpp"
+#include "advanced-scene-switcher.hpp"
 
 void SceneSelection::Save(obs_data_t *obj, const char *name,
 			  const char *typeName)
diff --git a/src/headers/scene-selection.hpp b/src/utils/scene-selection.hpp
similarity index 100%
rename from src/headers/scene-selection.hpp
rename to src/utils/scene-selection.hpp
diff --git a/src/screenshot-helper.cpp b/src/utils/screenshot-helper.cpp
similarity index 96%
rename from src/screenshot-helper.cpp
rename to src/utils/screenshot-helper.cpp
index 3cb276be..2502a7d4 100644
--- a/src/screenshot-helper.cpp
+++ b/src/utils/screenshot-helper.cpp
@@ -1,5 +1,5 @@
-#include "headers/screenshot-helper.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "screenshot-helper.hpp"
+#include "advanced-scene-switcher.hpp"
 
 static void ScreenshotTick(void *param, float);
 
diff --git a/src/headers/screenshot-helper.hpp b/src/utils/screenshot-helper.hpp
similarity index 100%
rename from src/headers/screenshot-helper.hpp
rename to src/utils/screenshot-helper.hpp
diff --git a/src/section.cpp b/src/utils/section.cpp
similarity index 98%
rename from src/section.cpp
rename to src/utils/section.cpp
index 18801524..624f2878 100644
--- a/src/section.cpp
+++ b/src/utils/section.cpp
@@ -1,5 +1,5 @@
-#include "headers/section.hpp"
-#include "headers/utility.hpp"
+#include "section.hpp"
+#include "utility.hpp"
 
 #include <QPropertyAnimation>
 #include <QEvent>
diff --git a/src/headers/section.hpp b/src/utils/section.hpp
similarity index 100%
rename from src/headers/section.hpp
rename to src/utils/section.hpp
diff --git a/src/transition-selection.cpp b/src/utils/transition-selection.cpp
similarity index 97%
rename from src/transition-selection.cpp
rename to src/utils/transition-selection.cpp
index 8c37b250..6fdb368f 100644
--- a/src/transition-selection.cpp
+++ b/src/utils/transition-selection.cpp
@@ -1,5 +1,5 @@
-#include "headers/transition-selection.hpp"
-#include "headers/advanced-scene-switcher.hpp"
+#include "transition-selection.hpp"
+#include "advanced-scene-switcher.hpp"
 
 void TransitionSelection::Save(obs_data_t *obj, const char *name,
 			       const char *typeName)
diff --git a/src/headers/transition-selection.hpp b/src/utils/transition-selection.hpp
similarity index 100%
rename from src/headers/transition-selection.hpp
rename to src/utils/transition-selection.hpp
diff --git a/src/utility.cpp b/src/utils/utility.cpp
similarity index 99%
rename from src/utility.cpp
rename to src/utils/utility.cpp
index 004be184..450b6464 100644
--- a/src/utility.cpp
+++ b/src/utils/utility.cpp
@@ -1,6 +1,6 @@
-#include "headers/utility.hpp"
-#include "headers/platform-funcs.hpp"
-#include "headers/scene-selection.hpp"
+#include "utility.hpp"
+#include "platform-funcs.hpp"
+#include "scene-selection.hpp"
 
 #include <QTextStream>
 #include <QLabel>
diff --git a/src/headers/utility.hpp b/src/utils/utility.hpp
similarity index 100%
rename from src/headers/utility.hpp
rename to src/utils/utility.hpp
diff --git a/src/volume-control.cpp b/src/utils/volume-control.cpp
similarity index 99%
rename from src/volume-control.cpp
rename to src/utils/volume-control.cpp
index 9f145567..2f130787 100644
--- a/src/volume-control.cpp
+++ b/src/utils/volume-control.cpp
@@ -1,4 +1,4 @@
-#include "headers/volume-control.hpp"
+#include "volume-control.hpp"
 
 #include <QFontDatabase>
 #include <QHBoxLayout>
diff --git a/src/headers/volume-control.hpp b/src/utils/volume-control.hpp
similarity index 100%
rename from src/headers/volume-control.hpp
rename to src/utils/volume-control.hpp
diff --git a/src/headers/version.h b/src/version.h
similarity index 100%
rename from src/headers/version.h
rename to src/version.h
diff --git a/src/win/advanced-scene-switcher-win.cpp b/src/win/advanced-scene-switcher-win.cpp
index 58e0d91c..534f3a13 100644
--- a/src/win/advanced-scene-switcher-win.cpp
+++ b/src/win/advanced-scene-switcher-win.cpp
@@ -1,4 +1,4 @@
-#include "../headers/hotkey.hpp"
+#include "platform-funcs.hpp"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -11,7 +11,6 @@
 #include <vector>
 #include <QStringList>
 #include <QRegularExpression>
-#include "..\headers\platform-funcs.hpp"
 
 #define MAX_SEARCH 1000