diff --git a/src/MouseWrapper.h b/src/MouseWrapper.h
index 7f6e39e8..ad127ce7 100644
--- a/src/MouseWrapper.h
+++ b/src/MouseWrapper.h
@@ -16,6 +16,6 @@
 
 #pragma once
 
-#warning Please migrate to including "kaleidoscope/plugin/MouseWrapper.h" instead of "MouseWrapper.h", or even consider dropping the include, because <Kaleidoscope-MouseKeys.h> will pull the right header in anyway.
+#warning The "MouseWrapper.h" header is deprecated, the same functionality is included by default when using <Kaleidoscope-MouseKeys.h>. It can be safely removed.
 
-#include "kaleidoscope/plugin/MouseWrapper.h"
+#include "kaleidoscope/plugin/MouseKeys/MouseWrapper.h"
diff --git a/src/kaleidoscope/plugin/MouseKeys.cpp b/src/kaleidoscope/plugin/MouseKeys.cpp
index 80612198..52fbe618 100644
--- a/src/kaleidoscope/plugin/MouseKeys.cpp
+++ b/src/kaleidoscope/plugin/MouseKeys.cpp
@@ -16,9 +16,8 @@
 
 #include <Arduino.h>
 
-#include "Kaleidoscope-MouseKeys.h"
-#include "MouseWrapper.h"
 #include "Kaleidoscope.h"
+#include "Kaleidoscope-MouseKeys.h"
 
 namespace kaleidoscope {
 namespace plugin {
diff --git a/src/kaleidoscope/plugin/MouseKeys.h b/src/kaleidoscope/plugin/MouseKeys.h
index 8b958cba..71ba3fd4 100644
--- a/src/kaleidoscope/plugin/MouseKeys.h
+++ b/src/kaleidoscope/plugin/MouseKeys.h
@@ -17,8 +17,9 @@
 #pragma once
 
 #include "Kaleidoscope.h"
-#include "MouseKeyDefs.h"
-#include "MouseWarpModes.h"
+#include "kaleidoscope/plugin/MouseKeys/MouseKeyDefs.h"
+#include "kaleidoscope/plugin/MouseKeys/MouseWarpModes.h"
+#include "kaleidoscope/plugin/MouseKeys/MouseWrapper.h"
 
 namespace kaleidoscope {
 namespace plugin {
diff --git a/src/kaleidoscope/plugin/MouseKeyDefs.h b/src/kaleidoscope/plugin/MouseKeys/MouseKeyDefs.h
similarity index 100%
rename from src/kaleidoscope/plugin/MouseKeyDefs.h
rename to src/kaleidoscope/plugin/MouseKeys/MouseKeyDefs.h
diff --git a/src/kaleidoscope/plugin/MouseWarpModes.h b/src/kaleidoscope/plugin/MouseKeys/MouseWarpModes.h
similarity index 100%
rename from src/kaleidoscope/plugin/MouseWarpModes.h
rename to src/kaleidoscope/plugin/MouseKeys/MouseWarpModes.h
diff --git a/src/kaleidoscope/plugin/MouseWrapper.cpp b/src/kaleidoscope/plugin/MouseKeys/MouseWrapper.cpp
similarity index 98%
rename from src/kaleidoscope/plugin/MouseWrapper.cpp
rename to src/kaleidoscope/plugin/MouseKeys/MouseWrapper.cpp
index ac6db7f9..b52fb2c1 100644
--- a/src/kaleidoscope/plugin/MouseWrapper.cpp
+++ b/src/kaleidoscope/plugin/MouseKeys/MouseWrapper.cpp
@@ -18,7 +18,7 @@
 // Mouse-related methods
 //
 //
-#include "MouseWrapper.h"
+#include "kaleidoscope/plugin/MouseKeys/MouseWrapper.h"
 #include "kaleidoscope/hid.h"
 
 namespace kaleidoscope {
diff --git a/src/kaleidoscope/plugin/MouseWrapper.h b/src/kaleidoscope/plugin/MouseKeys/MouseWrapper.h
similarity index 97%
rename from src/kaleidoscope/plugin/MouseWrapper.h
rename to src/kaleidoscope/plugin/MouseKeys/MouseWrapper.h
index e5938a18..c2641771 100644
--- a/src/kaleidoscope/plugin/MouseWrapper.h
+++ b/src/kaleidoscope/plugin/MouseKeys/MouseWrapper.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "Arduino.h"
-#include "MouseWarpModes.h"
+#include "kaleidoscope/plugin/MouseKeys/MouseWarpModes.h"
 
 // Warping commands