diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt
index 685a9e81e..56a0e0c03 100644
--- a/es-app/CMakeLists.txt
+++ b/es-app/CMakeLists.txt
@@ -22,6 +22,7 @@ set(ES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/Screensaver.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/UIModeController.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.h
 
     # GUIs
@@ -55,7 +56,6 @@ set(ES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/ISimpleGamelistView.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/VideoGamelistView.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.h
 )
 
@@ -72,6 +72,7 @@ set(ES_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/Screensaver.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/UIModeController.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.cpp
 
     # GUIs
@@ -105,7 +106,6 @@ set(ES_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/ISimpleGamelistView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/VideoGamelistView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.cpp
 )
 
diff --git a/es-app/src/CollectionSystemsManager.cpp b/es-app/src/CollectionSystemsManager.cpp
index 60481ca29..9452f30a1 100644
--- a/es-app/src/CollectionSystemsManager.cpp
+++ b/es-app/src/CollectionSystemsManager.cpp
@@ -27,11 +27,11 @@
 #include "Settings.h"
 #include "SystemData.h"
 #include "ThemeData.h"
+#include "UIModeController.h"
 #include "Window.h"
 #include "utils/FileSystemUtil.h"
 #include "utils/StringUtil.h"
 #include "utils/TimeUtil.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 #include "views/gamelist/IGamelistView.h"
 
diff --git a/es-app/src/FileData.cpp b/es-app/src/FileData.cpp
index 406996123..731dde70a 100644
--- a/es-app/src/FileData.cpp
+++ b/es-app/src/FileData.cpp
@@ -17,12 +17,12 @@
 #include "MameNames.h"
 #include "Scripting.h"
 #include "SystemData.h"
+#include "UIModeController.h"
 #include "Window.h"
 #include "utils/FileSystemUtil.h"
 #include "utils/PlatformUtil.h"
 #include "utils/StringUtil.h"
 #include "utils/TimeUtil.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 
 #include <assert.h>
diff --git a/es-app/src/FileFilterIndex.cpp b/es-app/src/FileFilterIndex.cpp
index df6f6a1ff..0842adb32 100644
--- a/es-app/src/FileFilterIndex.cpp
+++ b/es-app/src/FileFilterIndex.cpp
@@ -11,8 +11,8 @@
 #include "FileData.h"
 #include "Log.h"
 #include "Settings.h"
+#include "UIModeController.h"
 #include "utils/StringUtil.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 
 #include <cmath>
diff --git a/es-app/src/SystemData.cpp b/es-app/src/SystemData.cpp
index 6e7e25217..6c4ba35fc 100644
--- a/es-app/src/SystemData.cpp
+++ b/es-app/src/SystemData.cpp
@@ -18,10 +18,10 @@
 #include "Log.h"
 #include "Settings.h"
 #include "ThemeData.h"
+#include "UIModeController.h"
 #include "resources/ResourceManager.h"
 #include "utils/FileSystemUtil.h"
 #include "utils/StringUtil.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 #include "views/gamelist/IGamelistView.h"
 
diff --git a/es-app/src/views/UIModeController.cpp b/es-app/src/UIModeController.cpp
similarity index 100%
rename from es-app/src/views/UIModeController.cpp
rename to es-app/src/UIModeController.cpp
diff --git a/es-app/src/views/UIModeController.h b/es-app/src/UIModeController.h
similarity index 100%
rename from es-app/src/views/UIModeController.h
rename to es-app/src/UIModeController.h
diff --git a/es-app/src/guis/GuiGamelistFilter.cpp b/es-app/src/guis/GuiGamelistFilter.cpp
index bb583b558..a9cdb10be 100644
--- a/es-app/src/guis/GuiGamelistFilter.cpp
+++ b/es-app/src/guis/GuiGamelistFilter.cpp
@@ -11,12 +11,12 @@
 #include "guis/GuiGamelistFilter.h"
 
 #include "SystemData.h"
+#include "UIModeController.h"
 #include "components/BadgeComponent.h"
 #include "components/OptionListComponent.h"
 #include "guis/GuiTextEditKeyboardPopup.h"
 #include "guis/GuiTextEditPopup.h"
 #include "utils/StringUtil.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 
 GuiGamelistFilter::GuiGamelistFilter(Window* window,
diff --git a/es-app/src/guis/GuiGamelistOptions.cpp b/es-app/src/guis/GuiGamelistOptions.cpp
index c21159cad..9a1036311 100644
--- a/es-app/src/guis/GuiGamelistOptions.cpp
+++ b/es-app/src/guis/GuiGamelistOptions.cpp
@@ -19,9 +19,9 @@
 #include "MameNames.h"
 #include "Sound.h"
 #include "SystemData.h"
+#include "UIModeController.h"
 #include "guis/GuiGamelistFilter.h"
 #include "scrapers/Scraper.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 #include "views/gamelist/IGamelistView.h"
 
diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index 674556b1b..b8f8088d4 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -19,6 +19,7 @@
 #include "FileSorts.h"
 #include "Scripting.h"
 #include "SystemData.h"
+#include "UIModeController.h"
 #include "VolumeControl.h"
 #include "components/OptionListComponent.h"
 #include "components/SliderComponent.h"
@@ -33,7 +34,6 @@
 #include "guis/GuiTextEditKeyboardPopup.h"
 #include "guis/GuiTextEditPopup.h"
 #include "utils/PlatformUtil.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 #include "views/gamelist/IGamelistView.h"
 
diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp
index c4a41588f..a473ab142 100644
--- a/es-app/src/views/SystemView.cpp
+++ b/es-app/src/views/SystemView.cpp
@@ -12,10 +12,10 @@
 #include "Settings.h"
 #include "Sound.h"
 #include "SystemData.h"
+#include "UIModeController.h"
 #include "Window.h"
 #include "animations/LambdaAnimation.h"
 #include "guis/GuiMsgBox.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 
 #if defined(_WIN64)
diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp
index bee2efdb9..92dba451e 100644
--- a/es-app/src/views/ViewController.cpp
+++ b/es-app/src/views/ViewController.cpp
@@ -19,6 +19,7 @@
 #include "Sound.h"
 #include "SystemData.h"
 #include "SystemView.h"
+#include "UIModeController.h"
 #include "Window.h"
 #include "animations/Animation.h"
 #include "animations/LambdaAnimation.h"
@@ -27,7 +28,6 @@
 #include "guis/GuiTextEditKeyboardPopup.h"
 #include "guis/GuiTextEditPopup.h"
 #include "views/SystemView.h"
-#include "views/UIModeController.h"
 #include "views/gamelist/DetailedGamelistView.h"
 #include "views/gamelist/GridGamelistView.h"
 #include "views/gamelist/IGamelistView.h"
diff --git a/es-app/src/views/gamelist/BasicGamelistView.cpp b/es-app/src/views/gamelist/BasicGamelistView.cpp
index 05349cb00..fd1307885 100644
--- a/es-app/src/views/gamelist/BasicGamelistView.cpp
+++ b/es-app/src/views/gamelist/BasicGamelistView.cpp
@@ -11,8 +11,8 @@
 #include "CollectionSystemsManager.h"
 #include "Settings.h"
 #include "SystemData.h"
+#include "UIModeController.h"
 #include "utils/FileSystemUtil.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 
 BasicGamelistView::BasicGamelistView(Window* window, FileData* root)
diff --git a/es-app/src/views/gamelist/GridGamelistView.cpp b/es-app/src/views/gamelist/GridGamelistView.cpp
index f2ee53e75..187e7dd62 100644
--- a/es-app/src/views/gamelist/GridGamelistView.cpp
+++ b/es-app/src/views/gamelist/GridGamelistView.cpp
@@ -12,8 +12,8 @@
 #include "Settings.h"
 #include "Sound.h"
 #include "SystemData.h"
+#include "UIModeController.h"
 #include "animations/LambdaAnimation.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 
 #define FADE_IN_START_OPACITY 0.5f
diff --git a/es-app/src/views/gamelist/IGamelistView.cpp b/es-app/src/views/gamelist/IGamelistView.cpp
index 8e72f801b..06b61ac77 100644
--- a/es-app/src/views/gamelist/IGamelistView.cpp
+++ b/es-app/src/views/gamelist/IGamelistView.cpp
@@ -9,9 +9,9 @@
 #include "views/gamelist/IGamelistView.h"
 
 #include "Sound.h"
+#include "UIModeController.h"
 #include "Window.h"
 #include "guis/GuiGamelistOptions.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 
 IGamelistView::IGamelistView(Window* window, FileData* root)
diff --git a/es-app/src/views/gamelist/ISimpleGamelistView.cpp b/es-app/src/views/gamelist/ISimpleGamelistView.cpp
index 4ee199b06..24a2a78b3 100644
--- a/es-app/src/views/gamelist/ISimpleGamelistView.cpp
+++ b/es-app/src/views/gamelist/ISimpleGamelistView.cpp
@@ -13,9 +13,9 @@
 #include "Settings.h"
 #include "Sound.h"
 #include "SystemData.h"
+#include "UIModeController.h"
 #include "Window.h"
 #include "utils/StringUtil.h"
-#include "views/UIModeController.h"
 #include "views/ViewController.h"
 
 #include "Log.h"