diff --git a/CMakeLists.txt b/CMakeLists.txt
index 212be2f6b..d87268439 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,10 +97,10 @@ file (GLOB CXBXR_HEADER_GUIv1
  "${CXBXR_ROOT_DIR}/src/common/input/Button.h"
  "${CXBXR_ROOT_DIR}/src/common/input/EmuDevice.h"
  "${CXBXR_ROOT_DIR}/src/common/input/InputWindow.h"
+ "${CXBXR_ROOT_DIR}/src/gui/controllers/DlgDukeControllerConfig.h"
  "${CXBXR_ROOT_DIR}/src/gui/DlgAbout.h"
  "${CXBXR_ROOT_DIR}/src/gui/DlgAudioConfig.h"
  "${CXBXR_ROOT_DIR}/src/gui/DlgInputConfig.h"
- "${CXBXR_ROOT_DIR}/src/gui/DlgDukeControllerConfig.h"
  "${CXBXR_ROOT_DIR}/src/gui/DlgEepromConfig.h"
  "${CXBXR_ROOT_DIR}/src/gui/DlgLoggingConfig.h"
  "${CXBXR_ROOT_DIR}/src/gui/DlgNetworkConfig.h"
@@ -234,10 +234,10 @@ file (GLOB CXBXR_SOURCE_GUIv1
  "${CXBXR_ROOT_DIR}/src/common/input/Button.cpp"
  "${CXBXR_ROOT_DIR}/src/common/input/EmuDevice.cpp"
  "${CXBXR_ROOT_DIR}/src/common/input/InputWindow.cpp"
+ "${CXBXR_ROOT_DIR}/src/gui/controllers/DlgDukeControllerConfig.cpp"
  "${CXBXR_ROOT_DIR}/src/gui/DlgAbout.cpp"
  "${CXBXR_ROOT_DIR}/src/gui/DlgAudioConfig.cpp"
  "${CXBXR_ROOT_DIR}/src/gui/DlgInputConfig.cpp"
- "${CXBXR_ROOT_DIR}/src/gui/DlgDukeControllerConfig.cpp"
  "${CXBXR_ROOT_DIR}/src/gui/DlgEepromConfig.cpp"
  "${CXBXR_ROOT_DIR}/src/gui/DlgLoggingConfig.cpp"
  "${CXBXR_ROOT_DIR}/src/gui/DlgNetworkConfig.cpp"
diff --git a/src/gui/DlgInputConfig.cpp b/src/gui/DlgInputConfig.cpp
index 0301298f6..e407b3587 100644
--- a/src/gui/DlgInputConfig.cpp
+++ b/src/gui/DlgInputConfig.cpp
@@ -26,7 +26,7 @@
 // ******************************************************************
 
 #include "windows.h"
-#include "DlgDukeControllerConfig.h"
+#include "controllers/DlgDukeControllerConfig.h"
 #include "resource/ResCxbx.h"
 #include "input\InputManager.h"
 #include "Logging.h"
diff --git a/src/gui/DlgDukeControllerConfig.cpp b/src/gui/controllers/DlgDukeControllerConfig.cpp
similarity index 99%
rename from src/gui/DlgDukeControllerConfig.cpp
rename to src/gui/controllers/DlgDukeControllerConfig.cpp
index ce40c1ca7..f960e839f 100644
--- a/src/gui/DlgDukeControllerConfig.cpp
+++ b/src/gui/controllers/DlgDukeControllerConfig.cpp
@@ -28,7 +28,7 @@
 #define LOG_PREFIX CXBXR_MODULE::GUI
 
 #include "Windows.h"
-#include "resource/ResCxbx.h"
+#include "gui/resource/ResCxbx.h"
 #include "input\InputWindow.h"
 #include "gui\DlgInputConfig.h"
 #include "common/Logging.h"
diff --git a/src/gui/DlgDukeControllerConfig.h b/src/gui/controllers/DlgDukeControllerConfig.h
similarity index 100%
rename from src/gui/DlgDukeControllerConfig.h
rename to src/gui/controllers/DlgDukeControllerConfig.h
diff --git a/src/gui/DlgVirtualSBCFeedback.cpp b/src/gui/controllers/DlgVirtualSBCFeedback.cpp
similarity index 100%
rename from src/gui/DlgVirtualSBCFeedback.cpp
rename to src/gui/controllers/DlgVirtualSBCFeedback.cpp
diff --git a/src/gui/WndSBCFeedback.cpp b/src/gui/controllers/WndSBCFeedback.cpp
similarity index 100%
rename from src/gui/WndSBCFeedback.cpp
rename to src/gui/controllers/WndSBCFeedback.cpp
diff --git a/src/gui/WndSBCFeedback.h b/src/gui/controllers/WndSBCFeedback.h
similarity index 100%
rename from src/gui/WndSBCFeedback.h
rename to src/gui/controllers/WndSBCFeedback.h