diff --git a/Makefile.griffin b/Makefile.griffin
index e77d350e5d..35a59349a4 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -137,7 +137,7 @@ endif
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS      += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-INCLUDE     += -Iconsole/logger
+INCLUDE     += -Ilogger/netlogger
 endif
 
 ifeq ($(HAVE_LIBRETRO_MANAGEMENT), 1)
@@ -154,7 +154,7 @@ endif
 
 ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
-INCLUDE     += -Iconsole/logger
+INCLUDE     += -Ilogger/netlogger
 endif
 
 ifeq ($(HAVE_RARCH_EXEC), 1)
diff --git a/Makefile.ps3 b/Makefile.ps3
index f81d7486a3..9bcfff383a 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -121,7 +121,7 @@ endif
 
 ifeq ($(HAVE_LOGGER), 1)
 DEFINES			+= -DHAVE_LOGGER
-INCDIRS        +=  -Iconsole/logger
+INCDIRS        +=  -Ilogger/netlogger
 endif
 
 PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
diff --git a/Makefile.ps3.cobra b/Makefile.ps3.cobra
index 5a7c0b69a9..0497586a01 100644
--- a/Makefile.ps3.cobra
+++ b/Makefile.ps3.cobra
@@ -121,7 +121,7 @@ endif
 
 ifeq ($(HAVE_LOGGER), 1)
 DEFINES			+= -DHAVE_LOGGER
-INCDIRS        +=  -Iconsole/logger
+INCDIRS        +=  -Ilogger/netlogger
 endif
 
 PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 9e69e59fa0..35c6a3b94f 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -22,8 +22,8 @@ PPU_CFLAGS		+= -I. -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUT
 PPU_SRCS		= frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_null.c file_path.c compat/compat.c conf/config_file.c
 
 ifeq ($(HAVE_LOGGER), 1)
-PPU_CFLAGS		+= -DHAVE_LOGGER -Iconsole/logger
-PPU_SRCS		+= console/logger/logger.c
+PPU_CFLAGS		+= -DHAVE_LOGGER -Ilogger/netlogger
+PPU_SRCS		+= logger/netlogger/logger.c
 endif
 
 PPU_TARGET		= retroarch-salamander_ps3.elf
diff --git a/Makefile.psl1ght b/Makefile.psl1ght
index 018298068a..6ce8154ed6 100644
--- a/Makefile.psl1ght
+++ b/Makefile.psl1ght
@@ -83,7 +83,7 @@ OBJ = griffin/griffin.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
-CFLAGS		+= -Iconsole/logger
+CFLAGS		+= -Ilogger/netlogger
 endif
 
 ifeq ($(HAVE_FILE_LOGGER), 1)
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 7dcdd5fc42..ab55de62a0 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -44,13 +44,13 @@ OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platfo
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-CFLAGS          += -Iconsole/logger
-OBJ             += console/logger/logger.o
+CFLAGS          += -Ilogger/netlogger
+OBJ             += logger/netlogger/logger.o
 endif
 
 ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
-CFLAGS          += -Iconsole/logger
+CFLAGS          += -Ilogger/netlogger
 endif
 
 CFLAGS += -std=gnu99 -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_RARCH_EXEC -DGEKKO -Wno-char-subscripts 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index a55ba815cd..ed248a4730 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -38,9 +38,9 @@ CONSOLE EXTENSIONS
 #ifdef RARCH_CONSOLE
 
 #if defined(HAVE_LOGGER) && defined(__PSL1GHT__)
-#include "../console/logger/psl1ght_logger.c"
+#include "../logger/netlogger/psl1ght_logger.c"
 #elif defined(HAVE_LOGGER) && !defined(ANDROID)
-#include "../console/logger/logger.c"
+#include "../logger/netlogger/logger.c"
 #endif
 
 #ifdef HW_DOL
diff --git a/console/logger/logger.c b/logger/netlogger/logger.c
similarity index 100%
rename from console/logger/logger.c
rename to logger/netlogger/logger.c
diff --git a/console/logger/logger.h b/logger/netlogger/logger.h
similarity index 100%
rename from console/logger/logger.h
rename to logger/netlogger/logger.h
diff --git a/console/logger/logger_override.h b/logger/netlogger/logger_override.h
similarity index 100%
rename from console/logger/logger_override.h
rename to logger/netlogger/logger_override.h
diff --git a/console/logger/psl1ght_logger.c b/logger/netlogger/psl1ght_logger.c
similarity index 100%
rename from console/logger/psl1ght_logger.c
rename to logger/netlogger/psl1ght_logger.c