diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf8f62a191..c98431c445 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1283,8 +1283,6 @@ list(APPEND NativeAppSource
UI/GPUDriverTestScreen.cpp
UI/TiltAnalogSettingsScreen.h
UI/TiltAnalogSettingsScreen.cpp
- UI/TiltEventProcessor.h
- UI/TiltEventProcessor.cpp
UI/TouchControlLayoutScreen.h
UI/TouchControlLayoutScreen.cpp
UI/TouchControlVisibilityScreen.h
@@ -1706,6 +1704,8 @@ add_library(${CoreLibName} ${CoreLinkType}
Core/KeyMapDefaults.cpp
Core/KeyMapDefaults.h
Core/ThreadEventQueue.h
+ Core/TiltEventProcessor.h
+ Core/TiltEventProcessor.cpp
Core/WebServer.cpp
Core/WebServer.h
Core/Debugger/Breakpoints.cpp
diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj
index 49d60088d6..0ad2df793f 100644
--- a/Core/Core.vcxproj
+++ b/Core/Core.vcxproj
@@ -1041,6 +1041,7 @@
+
@@ -1397,6 +1398,7 @@
+
diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters
index 59ccf115ca..1fe06c2b6e 100644
--- a/Core/Core.vcxproj.filters
+++ b/Core/Core.vcxproj.filters
@@ -1195,6 +1195,9 @@
Ext
+
+ Core
+
@@ -1932,6 +1935,9 @@
Ext
+
+ Core
+
diff --git a/UI/TiltEventProcessor.cpp b/Core/TiltEventProcessor.cpp
similarity index 99%
rename from UI/TiltEventProcessor.cpp
rename to Core/TiltEventProcessor.cpp
index 36c51124d1..832f951e62 100644
--- a/UI/TiltEventProcessor.cpp
+++ b/Core/TiltEventProcessor.cpp
@@ -4,7 +4,7 @@
#include "Core/Config.h"
#include "Core/HLE/sceCtrl.h"
-#include "UI/TiltEventProcessor.h"
+#include "Core/TiltEventProcessor.h"
namespace TiltEventProcessor {
diff --git a/UI/TiltEventProcessor.h b/Core/TiltEventProcessor.h
similarity index 100%
rename from UI/TiltEventProcessor.h
rename to Core/TiltEventProcessor.h
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 9c6a74bcd9..4c9b71c09f 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -50,7 +50,6 @@
#include "UI/TouchControlLayoutScreen.h"
#include "UI/TouchControlVisibilityScreen.h"
#include "UI/TiltAnalogSettingsScreen.h"
-#include "UI/TiltEventProcessor.h"
#include "UI/GPUDriverTestScreen.h"
#include "UI/MemStickScreen.h"
#include "UI/Theme.h"
@@ -63,6 +62,7 @@
#include "Core/ConfigValues.h"
#include "Core/Host.h"
#include "Core/KeyMap.h"
+#include "Core/TiltEventProcessor.h"
#include "Core/Instance.h"
#include "Core/System.h"
#include "Core/Reporting.h"
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 4ce5b272d6..3432bf7890 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -99,6 +99,7 @@
#include "Core/Util/GameManager.h"
#include "Core/Util/AudioFormat.h"
#include "Core/WebServer.h"
+#include "Core/TiltEventProcessor.h"
#include "Core/ThreadPools.h"
#include "GPU/GPUInterface.h"
@@ -113,7 +114,6 @@
#include "UI/MemStickScreen.h"
#include "UI/OnScreenDisplay.h"
#include "UI/RemoteISOScreen.h"
-#include "UI/TiltEventProcessor.h"
#include "UI/Theme.h"
#if !defined(MOBILE_DEVICE) && defined(USING_QT_UI)
diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj
index 77977d1616..be370e4ef1 100644
--- a/UI/UI.vcxproj
+++ b/UI/UI.vcxproj
@@ -62,7 +62,6 @@
-
@@ -96,7 +95,6 @@
-
diff --git a/UI/UI.vcxproj.filters b/UI/UI.vcxproj.filters
index 092df509d0..2a80b85da1 100644
--- a/UI/UI.vcxproj.filters
+++ b/UI/UI.vcxproj.filters
@@ -37,9 +37,6 @@
Screens
-
- Screens
-
Screens
@@ -122,9 +119,6 @@
Screens
-
- Screens
-
Screens
diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj
index 7d21e2b2ab..2d89c268b3 100644
--- a/UWP/CoreUWP/CoreUWP.vcxproj
+++ b/UWP/CoreUWP/CoreUWP.vcxproj
@@ -592,6 +592,7 @@
+
@@ -879,6 +880,7 @@
+
@@ -5371,4 +5373,4 @@
-
+
\ No newline at end of file
diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters
index 005b363e13..119c2d0936 100644
--- a/UWP/CoreUWP/CoreUWP.vcxproj.filters
+++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters
@@ -1124,6 +1124,7 @@
HLE
+
@@ -1776,10 +1777,11 @@
HLE
+
Ext\gason
-
+
\ No newline at end of file
diff --git a/UWP/UI_UWP/UI_UWP.vcxproj b/UWP/UI_UWP/UI_UWP.vcxproj
index 43e4bfd18a..eda2c2c994 100644
--- a/UWP/UI_UWP/UI_UWP.vcxproj
+++ b/UWP/UI_UWP/UI_UWP.vcxproj
@@ -408,7 +408,6 @@
-
@@ -444,7 +443,6 @@
-
diff --git a/UWP/UI_UWP/UI_UWP.vcxproj.filters b/UWP/UI_UWP/UI_UWP.vcxproj.filters
index 0469c1be78..e88e172b3d 100644
--- a/UWP/UI_UWP/UI_UWP.vcxproj.filters
+++ b/UWP/UI_UWP/UI_UWP.vcxproj.filters
@@ -28,7 +28,6 @@
-
@@ -64,7 +63,6 @@
-
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 8aa57d384b..eae8a9c672 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -453,6 +453,7 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Core/Screenshot.cpp \
$(SRC)/Core/System.cpp \
$(SRC)/Core/TextureReplacer.cpp \
+ $(SRC)/Core/TiltEventProcessor.cpp \
$(SRC)/Core/ThreadPools.cpp \
$(SRC)/Core/WebServer.cpp \
$(SRC)/Core/Debugger/Breakpoints.cpp \
@@ -727,7 +728,6 @@ LOCAL_SRC_FILES := \
$(SRC)/UI/GameSettingsScreen.cpp \
$(SRC)/UI/GPUDriverTestScreen.cpp \
$(SRC)/UI/TiltAnalogSettingsScreen.cpp \
- $(SRC)/UI/TiltEventProcessor.cpp \
$(SRC)/UI/TouchControlLayoutScreen.cpp \
$(SRC)/UI/TouchControlVisibilityScreen.cpp \
$(SRC)/UI/CwCheatScreen.cpp \