diff --git a/Makefile.common b/Makefile.common
index 2036cb7b8a..17d19f0ba4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -62,7 +62,7 @@ endif
 ifneq ($(findstring Linux,$(OS)),)
    LIBS += -lrt
    JOYCONFIG_LIBS += -lrt
-   OBJ += input/linuxraw_input.o input/linuxraw_joypad.o
+   OBJ += input/drivers/linuxraw_input.o input/linuxraw_joypad.o
 endif
 
 ifeq ($(findstring Haiku,$(OS)),)
@@ -142,7 +142,7 @@ OBJ += frontend/frontend.o \
 		camera/nullcamera.o \
 		gfx/nullgfx.o \
 		audio/drivers/nullaudio.o \
-		input/nullinput.o \
+		input/drivers/nullinput.o \
 		input/nullinput_joypad.o \
 		input/osk/nullosk.o \
 		playlist.o \
@@ -172,7 +172,7 @@ endif
 
 ifeq ($(HAVE_EMSCRIPTEN), 1)
 OBJ += frontend/platform/platform_emscripten.o \
-		input/rwebinput_input.o \
+		input/drivers/rwebinput_input.o \
 		audio/drivers/rwebaudio.o \
 		camera/rwebcam.o
 endif
@@ -320,7 +320,7 @@ endif
 #Input
 
 ifeq ($(HAVE_WAYLAND), 1)
- #OBJ += input/wayland.o
+ #OBJ += input/drivers/wayland.o
  DEFINES += $(WAYLAND_CFLAGS)
  LIBS += $(WAYLAND_LIBS)
 endif
@@ -328,7 +328,7 @@ endif
 ifeq ($(HAVE_DINPUT), 1)
    LIBS += -ldinput8 -ldxguid -lole32
    DEFINES += -DHAVE_DINPUT
-   OBJ += input/dinput.o
+   OBJ += input/drivers/dinput.o
    JOYCONFIG_LIBS += -ldinput8 -ldxguid -lole32
 endif
 
@@ -339,7 +339,7 @@ ifeq ($(HAVE_WINXINPUT), 1)
 endif
 
 ifeq ($(HAVE_X11), 1)
-   OBJ += input/x11_input.o gfx/context/x11_common.o input/keyboard_event_x11.o
+   OBJ += input/drivers/x11_input.o gfx/context/x11_common.o input/keyboard_event_x11.o
    LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
    DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
 endif
@@ -354,7 +354,7 @@ ifeq ($(HAVE_UDEV), 1)
    DEFINES += $(UDEV_CFLAGS)
    LIBS += $(UDEV_LIBS)
    JOYCONFIG_LIBS += $(UDEV_LIBS)
-   OBJ += input/udev_input.o input/udev_joypad.o
+   OBJ += input/drivers/udev_input.o input/udev_joypad.o
 endif
 
 ifeq ($(HAVE_PARPORT), 1)
@@ -449,7 +449,7 @@ ifeq ($(HAVE_SDL2), 1)
 endif
 
 ifeq ($(HAVE_SDL), 1)
-   OBJ += gfx/sdl_gfx.o input/sdl_input.o input/sdl_joypad.o audio/drivers/sdl_audio.o
+   OBJ += gfx/sdl_gfx.o input/drivers/sdl_input.o input/sdl_joypad.o audio/drivers/sdl_audio.o
 
    ifeq ($(HAVE_OPENGL), 1)
      OBJ += gfx/context/sdl_gl_ctx.o
@@ -461,7 +461,7 @@ ifeq ($(HAVE_SDL), 1)
 endif
 
 ifeq ($(HAVE_SDL2), 1)
-   OBJ += gfx/sdl2_gfx.o input/sdl_input.o input/sdl_joypad.o audio/drivers/sdl_audio.o
+   OBJ += gfx/sdl2_gfx.o input/drivers/sdl_input.o input/sdl_joypad.o audio/drivers/sdl_audio.o
 
    ifeq ($(HAVE_OPENGL), 1)
      OBJ += gfx/context/sdl_gl_ctx.o
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 2af1e2e39b..b053b88a91 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -292,38 +292,38 @@ INPUT
 #endif
 
 #if defined(__CELLOS_LV2__)
-#include "../input/ps3_input.c"
+#include "../input/drivers/ps3_input.c"
 #include "../input/ps3_input_joypad.c"
 #include "../input/autoconf/builtin_ps3.c"
 #elif defined(SN_TARGET_PSP2) || defined(PSP)
-#include "../input/psp_input.c"
+#include "../input/drivers/psp_input.c"
 #include "../input/psp_input_joypad.c"
 #include "../input/autoconf/builtin_psp.c"
 #elif defined(GEKKO)
 #ifdef HAVE_LIBSICKSAXIS
 #include "../input/gx_input_sicksaxis.c"
 #endif
-#include "../input/gx_input.c"
+#include "../input/drivers/gx_input.c"
 #include "../input/gx_input_joypad.c"
 #include "../input/autoconf/builtin_gx.c"
 #elif defined(_XBOX)
-#include "../input/xdk_xinput_input.c"
+#include "../input/drivers/xdk_xinput_input.c"
 #include "../input/xdk_xinput_input_joypad.c"
 #include "../input/autoconf/builtin_xdk.c"
 #elif defined(_WIN32)
 #include "../input/autoconf/builtin_win.c"
 #elif defined(XENON)
-#include "../input/xenon360_input.c"
+#include "../input/drivers/xenon360_input.c"
 #elif defined(ANDROID)
-#include "../input/android_input.c"
+#include "../input/drivers/android_input.c"
 #include "../input/android_input_joypad.c"
 #elif defined(__APPLE__)
-#include "../input/apple_input.c"
+#include "../input/drivers/apple_input.c"
 #elif defined(__QNX__)
-#include "../input/qnx_input.c"
+#include "../input/drivers/qnx_input.c"
 #include "../input/qnx_input_joypad.c"
 #elif defined(EMSCRIPTEN)
-#include "../input/rwebinput_input.c"
+#include "../input/drivers/rwebinput_input.c"
 #endif
 
 #if defined(__APPLE__)
@@ -343,7 +343,7 @@ INPUT
 #endif
 
 #ifdef HAVE_DINPUT
-#include "../input/dinput.c"
+#include "../input/drivers/dinput.c"
 #endif
 
 #ifdef HAVE_WINXINPUT
@@ -357,20 +357,20 @@ INPUT
 #include "../input/osk/nullosk.c"
 
 #if defined(__linux__) && !defined(ANDROID) 
-#include "../input/linuxraw_input.c"
+#include "../input/drivers/linuxraw_input.c"
 #include "../input/linuxraw_joypad.c"
 #endif
 
 #ifdef HAVE_X11
-#include "../input/x11_input.c"
+#include "../input/drivers/x11_input.c"
 #endif
 
 #ifdef HAVE_UDEV
-#include "../input/udev_input.c"
+#include "../input/drivers/udev_input.c"
 #include "../input/udev_joypad.c"
 #endif
 
-#include "../input/nullinput.c"
+#include "../input/drivers/nullinput.c"
 #include "../input/nullinput_joypad.c"
 
 /*============================================================
diff --git a/input/apple_keycode.h b/input/apple_keycode.h
deleted file mode 100644
index 4ca31391d5..0000000000
--- a/input/apple_keycode.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-Taken from https://github.com/depp/keycode, distributed with the following license:
-
-Copyright 2011-2012 Dietrich Epp <depp@zdome.net>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* This file is automatically generated by keycode.py.  */
-#ifndef KEYCODE_KEYCODE_H
-#define KEYCODE_KEYCODE_H
-
-enum
-{
-   KEY_A = 4,
-   KEY_B = 5,
-   KEY_C = 6,
-   KEY_D = 7,
-   KEY_E = 8,
-   KEY_F = 9,
-   KEY_G = 10,
-   KEY_H = 11,
-   KEY_I = 12,
-   KEY_J = 13,
-   KEY_K = 14,
-   KEY_L = 15,
-   KEY_M = 16,
-   KEY_N = 17,
-   KEY_O = 18,
-   KEY_P = 19,
-   KEY_Q = 20,
-   KEY_R = 21,
-   KEY_S = 22,
-   KEY_T = 23,
-   KEY_U = 24,
-   KEY_V = 25,
-   KEY_W = 26,
-   KEY_X = 27,
-   KEY_Y = 28,
-   KEY_Z = 29,
-   KEY_1 = 30,
-   KEY_2 = 31,
-   KEY_3 = 32,
-   KEY_4 = 33,
-   KEY_5 = 34,
-   KEY_6 = 35,
-   KEY_7 = 36,
-   KEY_8 = 37,
-   KEY_9 = 38,
-   KEY_0 = 39,
-   KEY_Enter = 40,
-   KEY_Escape = 41,
-   KEY_Delete = 42,
-   KEY_Tab = 43,
-   KEY_Space = 44,
-   KEY_Minus = 45,
-   KEY_Equals = 46,
-   KEY_LeftBracket = 47,
-   KEY_RightBracket = 48,
-   KEY_Backslash = 49,
-   KEY_Semicolon = 51,
-   KEY_Quote = 52,
-   KEY_Grave = 53,
-   KEY_Comma = 54,
-   KEY_Period = 55,
-   KEY_Slash = 56,
-   KEY_CapsLock = 57,
-   KEY_F1 = 58,
-   KEY_F2 = 59,
-   KEY_F3 = 60,
-   KEY_F4 = 61,
-   KEY_F5 = 62,
-   KEY_F6 = 63,
-   KEY_F7 = 64,
-   KEY_F8 = 65,
-   KEY_F9 = 66,
-   KEY_F10 = 67,
-   KEY_F11 = 68,
-   KEY_F12 = 69,
-   KEY_PrintScreen = 70,
-   KEY_ScrollLock = 71,
-   KEY_Pause = 72,
-   KEY_Insert = 73,
-   KEY_Home = 74,
-   KEY_PageUp = 75,
-   KEY_DeleteForward = 76,
-   KEY_End = 77,
-   KEY_PageDown = 78,
-   KEY_Right = 79,
-   KEY_Left = 80,
-   KEY_Down = 81,
-   KEY_Up = 82,
-   KP_NumLock = 83,
-   KP_Divide = 84,
-   KP_Multiply = 85,
-   KP_Subtract = 86,
-   KP_Add = 87,
-   KP_Enter = 88,
-   KP_1 = 89,
-   KP_2 = 90,
-   KP_3 = 91,
-   KP_4 = 92,
-   KP_5 = 93,
-   KP_6 = 94,
-   KP_7 = 95,
-   KP_8 = 96,
-   KP_9 = 97,
-   KP_0 = 98,
-   KP_Point = 99,
-   KEY_NonUSBackslash = 100,
-   KP_Equals = 103,
-   KEY_F13 = 104,
-   KEY_F14 = 105,
-   KEY_F15 = 106,
-   KEY_F16 = 107,
-   KEY_F17 = 108,
-   KEY_F18 = 109,
-   KEY_F19 = 110,
-   KEY_F20 = 111,
-   KEY_F21 = 112,
-   KEY_F22 = 113,
-   KEY_F23 = 114,
-   KEY_F24 = 115,
-   KEY_Help = 117,
-   KEY_Menu = 118,
-   KEY_LeftControl = 224,
-   KEY_LeftShift = 225,
-   KEY_LeftAlt = 226,
-   KEY_LeftGUI = 227,
-   KEY_RightControl = 228,
-   KEY_RightShift = 229,
-   KEY_RightAlt = 230,
-   KEY_RightGUI = 231
-};
-
-#include "input_common.h"
-
-struct apple_key_name_map_entry
-{
-   const char* const keyname;
-   const uint32_t hid_id;
-};
-
-extern const struct apple_key_name_map_entry apple_key_name_map[];
-
-#endif
diff --git a/input/android_input.c b/input/drivers/android_input.c
similarity index 99%
rename from input/android_input.c
rename to input/drivers/android_input.c
index e2a160a3bc..919de556ab 100644
--- a/input/android_input.c
+++ b/input/drivers/android_input.c
@@ -19,13 +19,13 @@
 #include <android/keycodes.h>
 #include <unistd.h>
 #include <dlfcn.h>
-#include "../frontend/platform/platform_android.h"
-#include "input_autodetect.h"
-#include "input_common.h"
-#include "input_joypad.h"
-#include "../performance.h"
-#include "../general.h"
-#include "../driver.h"
+#include "../../frontend/platform/platform_android.h"
+#include "../input_autodetect.h"
+#include "../input_common.h"
+#include "../input_joypad.h"
+#include "../../performance.h"
+#include "../../general.h"
+#include "../../driver.h"
 
 #define MAX_TOUCH 16
 #define MAX_PADS 8
diff --git a/input/apple_input.c b/input/drivers/apple_input.c
similarity index 98%
rename from input/apple_input.c
rename to input/drivers/apple_input.c
index 1166e8f98c..7e234118b6 100644
--- a/input/apple_input.c
+++ b/input/drivers/apple_input.c
@@ -17,12 +17,12 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include "input_common.h"
-#include "input_joypad.h"
-#include "input_keymaps.h"
+#include "../input_common.h"
+#include "../input_joypad.h"
+#include "../input_keymaps.h"
 #include "apple_input.h"
-#include "../general.h"
-#include "../driver.h"
+#include "../../general.h"
+#include "../../driver.h"
 
 #include "apple_keycode.h"
 
diff --git a/input/apple_input.h b/input/drivers/apple_input.h
similarity index 96%
rename from input/apple_input.h
rename to input/drivers/apple_input.h
index c513c88fc4..47902c779a 100644
--- a/input/apple_input.h
+++ b/input/drivers/apple_input.h
@@ -17,8 +17,8 @@
 #ifndef __APPLE_RARCH_INPUT_H__
 #define __APPLE_RARCH_INPUT_H__
 
-#include "../general.h"
-#include "connect/joypad_connection.h"
+#include "../../general.h"
+#include "../connect/joypad_connection.h"
 
 /* Input responder */
 #define MAX_TOUCHES 16
diff --git a/input/dinput.c b/input/drivers/dinput.c
similarity index 99%
rename from input/dinput.c
rename to input/drivers/dinput.c
index 082d8385d4..2419a19758 100644
--- a/input/dinput.c
+++ b/input/drivers/dinput.c
@@ -22,13 +22,13 @@
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
 
-#include "../general.h"
+#include "../../general.h"
 #include <boolean.h>
-#include "input_autodetect.h"
-#include "input_common.h"
-#include "input_joypad.h"
-#include "input_keymaps.h"
-#include "retroarch_logger.h"
+#include "../input_autodetect.h"
+#include "../input_common.h"
+#include "../input_joypad.h"
+#include "../input_keymaps.h"
+#include "../../retroarch_logger.h"
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/input/gx_input.c b/input/drivers/gx_input.c
similarity index 98%
rename from input/gx_input.c
rename to input/drivers/gx_input.c
index 9017510101..b1b1f62a99 100644
--- a/input/gx_input.c
+++ b/input/drivers/gx_input.c
@@ -23,8 +23,8 @@
 #define M_PI 3.14159265358979323846264338327
 #endif
 
-#include "../driver.h"
-#include "../libretro.h"
+#include "../../driver.h"
+#include "../../libretro.h"
 #include <stdlib.h>
 
 #ifndef MAX_PADS
diff --git a/input/linuxraw_input.c b/input/drivers/linuxraw_input.c
similarity index 98%
rename from input/linuxraw_input.c
rename to input/drivers/linuxraw_input.c
index a1064aa493..59c57a2181 100644
--- a/input/linuxraw_input.c
+++ b/input/drivers/linuxraw_input.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../driver.h"
+#include "../../driver.h"
 
 #include <sys/ioctl.h>
 #include <linux/input.h>
@@ -22,10 +22,10 @@
 #include <termios.h>
 #include <unistd.h>
 #include <signal.h>
-#include "../general.h"
-#include "input_keymaps.h"
-#include "input_common.h"
-#include "input_joypad.h"
+#include "../../general.h"
+#include "../input_keymaps.h"
+#include "../input_common.h"
+#include "../input_joypad.h"
 
 static long oldKbmd = 0xffff;
 static struct termios oldTerm, newTerm;
diff --git a/input/nullinput.c b/input/drivers/nullinput.c
similarity index 97%
rename from input/nullinput.c
rename to input/drivers/nullinput.c
index 28d44311c5..9f9f0dd154 100644
--- a/input/nullinput.c
+++ b/input/drivers/nullinput.c
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../general.h"
-#include "../driver.h"
+#include "../../general.h"
+#include "../../driver.h"
 
 static void *nullinput_input_init(void)
 {
diff --git a/input/ps3_input.c b/input/drivers/ps3_input.c
similarity index 98%
rename from input/ps3_input.c
rename to input/drivers/ps3_input.c
index b93f12805b..9fe8b6e3bc 100644
--- a/input/ps3_input.c
+++ b/input/drivers/ps3_input.c
@@ -20,11 +20,11 @@
 #include <sdk_version.h>
 #include <boolean.h>
 
-#include "../ps3/sdk_defines.h"
+#include "../../ps3/sdk_defines.h"
 
-#include "../driver.h"
-#include "../libretro.h"
-#include "../general.h"
+#include "../../driver.h"
+#include "../../libretro.h"
+#include "../../general.h"
 
 #ifdef HAVE_MOUSE
 #ifndef __PSL1GHT__
diff --git a/input/psp_input.c b/input/drivers/psp_input.c
similarity index 93%
rename from input/psp_input.c
rename to input/drivers/psp_input.c
index f14e4fc8a4..9c24b21159 100644
--- a/input/psp_input.c
+++ b/input/drivers/psp_input.c
@@ -25,14 +25,14 @@
 #include <pspctrl.h>
 #endif
 
-#include "../gfx/psp/sdk_defines.h"
+#include "../../gfx/psp/sdk_defines.h"
 
-#include "../driver.h"
-#include "../libretro.h"
-#include "../general.h"
-#include "input_common.h"
+#include "../../driver.h"
+#include "../../libretro.h"
+#include "../../general.h"
+#include "../input_common.h"
 #ifdef HAVE_KERNEL_PRX
-#include "../psp1/kernel_functions.h"
+#include "../../psp1/kernel_functions.h"
 #endif
 
 #define MAX_PADS 1
diff --git a/input/qnx_input.c b/input/drivers/qnx_input.c
similarity index 99%
rename from input/qnx_input.c
rename to input/drivers/qnx_input.c
index 3f92031118..a76c5ec792 100644
--- a/input/qnx_input.c
+++ b/input/drivers/qnx_input.c
@@ -15,13 +15,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../general.h"
-#include "../driver.h"
+#include "../../general.h"
+#include "../../driver.h"
 #include <screen/screen.h>
 #include <bps/event.h>
 #include <bps/navigator.h>
 #include <sys/keycodes.h>
-#Include "input_autodetect.h"
+#include "../input_autodetect.h"
 
 #define MAX_PADS 8
 
diff --git a/input/rwebinput_input.c b/input/drivers/rwebinput_input.c
similarity index 96%
rename from input/rwebinput_input.c
rename to input/drivers/rwebinput_input.c
index 605506e746..c5499519c0 100644
--- a/input/rwebinput_input.c
+++ b/input/drivers/rwebinput_input.c
@@ -13,17 +13,17 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input_autodetect.h"
-#include "input_common.h"
-#include "input_keymaps.h"
+#include "../input_autodetect.h"
+#include "../input_common.h"
+#include "../input_keymaps.h"
 
-#include "../driver.h"
+#include "../../driver.h"
 
 #include <boolean.h>
-#include "../general.h"
-#include "keyboard_line.h"
+#include "../../general.h"
+#include "../keyboard_line.h"
 
-#include "../emscripten/RWebInput.h"
+#include "../../emscripten/RWebInput.h"
 
 static bool uninited = false;
 
diff --git a/input/sdl_input.c b/input/drivers/sdl_input.c
similarity index 97%
rename from input/sdl_input.c
rename to input/drivers/sdl_input.c
index 264ac6b261..0fd3301da3 100644
--- a/input/sdl_input.c
+++ b/input/drivers/sdl_input.c
@@ -14,20 +14,20 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../driver.h"
+#include "../../driver.h"
 
 #include "SDL.h"
-#include "../gfx/gfx_context.h"
+#include "../../gfx/gfx_context.h"
 #include <boolean.h>
-#include "../general.h"
+#include "../../general.h"
 #include <stdint.h>
 #include <stdlib.h>
-#include "../libretro.h"
-#include "input_autodetect.h"
-#include "input_common.h"
-#include "input_joypad.h"
-#include "input_keymaps.h"
-#include "keyboard_line.h"
+#include "../../libretro.h"
+#include "../input_autodetect.h"
+#include "../input_common.h"
+#include "../input_joypad.h"
+#include "../input_keymaps.h"
+#include "../keyboard_line.h"
 
 typedef struct sdl_input
 {
diff --git a/input/udev_input.c b/input/drivers/udev_input.c
similarity index 99%
rename from input/udev_input.c
rename to input/drivers/udev_input.c
index 59c5b98802..a1e225f5a0 100644
--- a/input/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -13,10 +13,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input_common.h"
-#include "input_joypad.h"
-#include "input_keymaps.h"
-#include "../general.h"
+#include "../input_common.h"
+#include "../input_joypad.h"
+#include "../input_keymaps.h"
+#include "../../general.h"
 #include <file/file_path.h>
 #include <unistd.h>
 #include <stdint.h>
@@ -36,7 +36,7 @@
 #include <signal.h>
 
 #ifdef HAVE_CONFIG_H
-#include "../config.h"
+#include "../../config.h"
 #endif
 
 /* Need libxkbcommon to translate raw evdev events to characters
diff --git a/input/x11_input.c b/input/drivers/x11_input.c
similarity index 98%
rename from input/x11_input.c
rename to input/drivers/x11_input.c
index 2a5854de5f..9476eea967 100644
--- a/input/x11_input.c
+++ b/input/drivers/x11_input.c
@@ -13,14 +13,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input_common.h"
-#include "input_joypad.h"
-#include "input_keymaps.h"
+#include "../input_common.h"
+#include "../input_joypad.h"
+#include "../input_keymaps.h"
 
-#include "../driver.h"
+#include "../../driver.h"
 
 #include <boolean.h>
-#include "../general.h"
+#include "../../general.h"
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/input/xdk_xinput_input.c b/input/drivers/xdk_xinput_input.c
similarity index 97%
rename from input/xdk_xinput_input.c
rename to input/drivers/xdk_xinput_input.c
index 5db1b5ca59..8b4e8f326f 100644
--- a/input/xdk_xinput_input.c
+++ b/input/drivers/xdk_xinput_input.c
@@ -21,9 +21,9 @@
 #include <xtl.h>
 #endif
 
-#include "../driver.h"
-#include "../general.h"
-#include "../libretro.h"
+#include "../../driver.h"
+#include "../../general.h"
+#include "../../libretro.h"
 
 #define MAX_PADS 4
 
diff --git a/input/xenon360_input.c b/input/drivers/xenon360_input.c
similarity index 98%
rename from input/xenon360_input.c
rename to input/drivers/xenon360_input.c
index 43e075bb0f..4580506efe 100644
--- a/input/xenon360_input.c
+++ b/input/drivers/xenon360_input.c
@@ -18,8 +18,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../driver.h"
-#include "../libretro.h"
+#include "../../driver.h"
+#include "../../libretro.h"
 
 #include <input/input.h>
 #include <usb/usbmain.h>
diff --git a/tools/retroarch-joyconfig-griffin.c b/tools/retroarch-joyconfig-griffin.c
index 1414ce7901..f653d14c14 100644
--- a/tools/retroarch-joyconfig-griffin.c
+++ b/tools/retroarch-joyconfig-griffin.c
@@ -17,12 +17,12 @@
 #include "retroarch-joyconfig.c"
 
 #if defined(__linux) && !defined(ANDROID)
-#include "../input/linuxraw_input.c"
+#include "../input/drivers/linuxraw_input.c"
 #include "../input/linuxraw_joypad.c"
 #endif
 
 #if defined(HAVE_DINPUT)
-#include "../input/dinput.c"
+#include "../input/drivers/dinput.c"
 #endif
 
 #if defined(HAVE_WINXINPUT)
@@ -46,7 +46,7 @@
 #include "../libretro-sdk/string/string_list.c"
 #include "../libretro-sdk/compat/compat.c"
 
-#include "../input/nullinput.c"
+#include "../input/drivers/nullinput.c"
 #include "../input/nullinput_joypad.c"
 
 #include "../input/input_context.c"