diff --git a/griffin/griffin.c b/griffin/griffin.c
index 62eb8c1d84..2d11fb62c8 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -333,10 +333,10 @@ INPUT
 #endif
 
 #if defined(__APPLE__)
-#include "../input/joypad_connection.c"
-#include "../input/apple_joypad_ps3.c"
-#include "../input/apple_joypad_ps4.c"
-#include "../input/apple_joypad_wii.c"
+#include "../connect/joypad_connection.c"
+#include "../connect/connect_ps3.c"
+#include "../connect/connect_ps4.c"
+#include "../connect/connect_wii.c"
 
 #ifdef HAVE_HID
 #include "../input/apple_joypad_hid.c"
diff --git a/input/apple_input.h b/input/apple_input.h
index 1dbf62484a..de09b8ee2f 100644
--- a/input/apple_input.h
+++ b/input/apple_input.h
@@ -18,7 +18,7 @@
 #define __APPLE_RARCH_INPUT_H__
 
 #include "../general.h"
-#include "joypad_connection.h"
+#include "connect/joypad_connection.h"
 
 /* Input responder */
 #define MAX_TOUCHES 16
diff --git a/input/apple_joypad_ps3.c b/input/connect/connect_ps3.c
similarity index 99%
rename from input/apple_joypad_ps3.c
rename to input/connect/connect_ps3.c
index e653303fca..f463b7c6cd 100644
--- a/input/apple_joypad_ps3.c
+++ b/input/connect/connect_ps3.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../boolean.h"
+#include "../../boolean.h"
 #include "joypad_connection.h"
 
 struct hidpad_ps3_data
diff --git a/input/apple_joypad_ps4.c b/input/connect/connect_ps4.c
similarity index 99%
rename from input/apple_joypad_ps4.c
rename to input/connect/connect_ps4.c
index 60dea3afaa..2ab3dedf2d 100644
--- a/input/apple_joypad_ps4.c
+++ b/input/connect/connect_ps4.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../boolean.h"
+#include "../../boolean.h"
 #include "joypad_connection.h"
 
 struct hidpad_ps4_data
diff --git a/input/apple_joypad_wii.c b/input/connect/connect_wii.c
similarity index 99%
rename from input/apple_joypad_wii.c
rename to input/connect/connect_wii.c
index 54605f0b42..6d9f108ca2 100644
--- a/input/apple_joypad_wii.c
+++ b/input/connect/connect_wii.c
@@ -17,8 +17,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../boolean.h"
-#include "wiimote.h"
+#include "connect_wii.h"
 #include "joypad_connection.h"
 
 #ifndef NO_BAKED_IN_WIIMOTE
diff --git a/input/wiimote.h b/input/connect/connect_wii.h
similarity index 100%
rename from input/wiimote.h
rename to input/connect/connect_wii.h
diff --git a/input/joypad_connection.c b/input/connect/joypad_connection.c
similarity index 100%
rename from input/joypad_connection.c
rename to input/connect/joypad_connection.c
diff --git a/input/joypad_connection.h b/input/connect/joypad_connection.h
similarity index 100%
rename from input/joypad_connection.h
rename to input/connect/joypad_connection.h