diff --git a/Makefile.common b/Makefile.common
index d857f7b0aa..960cdcf767 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -998,7 +998,10 @@ ifeq ($(HAVE_NETWORKING), 1)
 
    ifeq ($(HAVE_NETPLAY), 1)
       DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD -DHAVE_NETWORK_GAMEPAD
-      OBJ += network/netplay_net.o network/netplay_spectate.o network/netplay_common.o network/netplay.o
+      OBJ += network/netplay/netplay_net.o \
+				 network/netplay/netplay_spectate.o \
+				 network/netplay/netplay_common.o \
+				 network/netplay/netplay.o
    endif
 
    # Retro Achievements (also depends on threads)
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index d2ef7e9124..1fea230bbe 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -37,7 +37,7 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 
 ifeq ($(HAVE_LOGGER), 1)
 PPU_CFLAGS		+= -DHAVE_LOGGER 
-PPU_SRCS		   += network/netlogger.c \
+PPU_SRCS		   += network/net_logger.c \
 						libretro-common/net/net_compat.c \
 						libretro-common/net/net_socket.c
 endif
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 935d81c101..eca6bb633e 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -60,7 +60,7 @@ OBJ = frontend/frontend_salamander.o \
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-OBJ             += network/netlogger.o \
+OBJ             += network/net_logger.o \
 						 libretro-common/net/net_compat.o \
 						 libretro-common/net/net_socket.o
 endif
diff --git a/command.c b/command.c
index 4726a9057a..91553dc028 100644
--- a/command.c
+++ b/command.c
@@ -76,7 +76,7 @@
 #endif
 
 #ifdef HAVE_NETPLAY
-#include "network/netplay.h"
+#include "network/netplay/netplay.h"
 #endif
 
 #ifdef HAVE_NETWORKING
diff --git a/core_impl.c b/core_impl.c
index 2c3d365418..51cca53350 100644
--- a/core_impl.c
+++ b/core_impl.c
@@ -36,7 +36,7 @@
 #include "audio/audio_driver.h"
 
 #ifdef HAVE_NETPLAY
-#include "network/netplay.h"
+#include "network/netplay/netplay.h"
 #endif
 
 static struct retro_core_t core;
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 29b439defb..a96ce1b2cc 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -31,7 +31,7 @@
 #include "../verbosity.c"
 
 #if defined(HAVE_LOGGER) && !defined(ANDROID)
-#include "../network/netlogger.c"
+#include "../network/net_logger.c"
 #endif
 
 /*============================================================
@@ -799,10 +799,10 @@ THREAD
 NETPLAY
 ============================================================ */
 #ifdef HAVE_NETPLAY
-#include "../network/netplay_net.c"
-#include "../network/netplay_spectate.c"
-#include "../network/netplay_common.c"
-#include "../network/netplay.c"
+#include "../network/netplay/netplay_net.c"
+#include "../network/netplay/netplay_spectate.c"
+#include "../network/netplay/netplay_common.c"
+#include "../network/netplay/netplay.c"
 #include "../libretro-common/net/net_compat.c"
 #include "../libretro-common/net/net_socket.c"
 #include "../libretro-common/net/net_http.c"
diff --git a/network/netlogger.c b/network/net_logger.c
similarity index 98%
rename from network/netlogger.c
rename to network/net_logger.c
index c6e2dcef06..4050f623e3 100644
--- a/network/netlogger.c
+++ b/network/net_logger.c
@@ -27,7 +27,7 @@
 #include <net/net_compat.h>
 #include <net/net_socket.h>
 
-#include "verbosity.h"
+#include "../verbosity.h"
 
 #if !defined(PC_DEVELOPMENT_IP_ADDRESS)
 #error "An IP address for the PC logging server was not set in the Makefile, cannot continue."
diff --git a/network/netplay.c b/network/netplay/netplay.c
similarity index 100%
rename from network/netplay.c
rename to network/netplay/netplay.c
diff --git a/network/netplay.h b/network/netplay/netplay.h
similarity index 99%
rename from network/netplay.h
rename to network/netplay/netplay.h
index 8f22abc60a..b0888a2ba0 100644
--- a/network/netplay.h
+++ b/network/netplay/netplay.h
@@ -24,7 +24,7 @@
 #include <boolean.h>
 #include <libretro.h>
 
-#include "../core.h"
+#include "../../core.h"
 
 typedef struct netplay netplay_t;
 
diff --git a/network/netplay_common.c b/network/netplay/netplay_common.c
similarity index 99%
rename from network/netplay_common.c
rename to network/netplay/netplay_common.c
index 7d438e3525..4d5ae598c3 100644
--- a/network/netplay_common.c
+++ b/network/netplay/netplay_common.c
@@ -16,7 +16,8 @@
 
 #include "netplay_private.h"
 #include <net/net_socket.h>
-#include "../content.h"
+
+#include "../../content.h"
 
 bool netplay_get_nickname(netplay_t *netplay, int fd)
 {
diff --git a/network/netplay_net.c b/network/netplay/netplay_net.c
similarity index 100%
rename from network/netplay_net.c
rename to network/netplay/netplay_net.c
diff --git a/network/netplay_private.h b/network/netplay/netplay_private.h
similarity index 94%
rename from network/netplay_private.h
rename to network/netplay/netplay_private.h
index e52ceae46a..6223283bca 100644
--- a/network/netplay_private.h
+++ b/network/netplay/netplay_private.h
@@ -22,15 +22,15 @@
 #include <net/net_compat.h>
 #include <retro_endianness.h>
 
-#include "../command.h"
-#include "../general.h"
-#include "../autosave.h"
-#include "../dynamic.h"
-#include "../movie.h"
-#include "../msg_hash.h"
-#include "../system.h"
-#include "../runloop.h"
-#include "../verbosity.h"
+#include "../../command.h"
+#include "../../general.h"
+#include "../../autosave.h"
+#include "../../dynamic.h"
+#include "../../movie.h"
+#include "../../msg_hash.h"
+#include "../../system.h"
+#include "../../runloop.h"
+#include "../../verbosity.h"
 
 #ifdef ANDROID
 #define HAVE_IPV6
diff --git a/network/netplay_spectate.c b/network/netplay/netplay_spectate.c
similarity index 100%
rename from network/netplay_spectate.c
rename to network/netplay/netplay_spectate.c
diff --git a/runloop.c b/runloop.c
index 3a8937b7d1..2056c0195e 100644
--- a/runloop.c
+++ b/runloop.c
@@ -65,7 +65,7 @@
 #endif
 
 #ifdef HAVE_NETPLAY
-#include "network/netplay.h"
+#include "network/netplay/netplay.h"
 #endif
 
 #include "verbosity.h"