diff --git a/Makefile.ps3 b/Makefile.ps3
index 46ec3fb007..1e4c5e6e47 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -30,8 +30,8 @@ include $(CELL_MK_DIR)/sdk.makedef.mk
 PPU_TARGET		= retroarch_ps3.elf
 SALAMANDER_TARGET	= retroarch-salamander_ps3.elf
 
-EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
-CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF
+EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
+CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
 
 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
 INCDIRS = -I. -Ips3 -Icommon -Ideps/zlib -Ilibretro-common/include
@@ -157,28 +157,28 @@ create-salamander:
 	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)
 
 copy-media-files:
-	@cp -r $(RMENU_IMG_DIR)/*.png ps3/pkg/USRDIR/cores/borders/Menu/
+	@cp -r $(RMENU_IMG_DIR)/*.png pkg/ps3/USRDIR/cores/borders/Menu/
 
 create-shaders:
 	make -f Makefile.shaders deploy-ps3
 
 pkg: $(PPU_TARGET)  create-shaders copy-media-files create-npdrm-salamander create-npdrm-core
-	$(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg
+	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3
 
 pkg-signed: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION).pkg
 
 pkg-signed-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
 	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION).pkg
 
 pkg-signed-cfw: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
 	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
 
 pkg-signed-cfw-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
 	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION).pkg
 	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
 
 clean-selfs:
diff --git a/Makefile.ps3.cobra b/Makefile.ps3.cobra
index c542425989..753b171666 100644
--- a/Makefile.ps3.cobra
+++ b/Makefile.ps3.cobra
@@ -30,8 +30,8 @@ include $(CELL_MK_DIR)/sdk.makedef.mk
 PPU_TARGET		= retroarch_ps3.elf
 SALAMANDER_TARGET	= retroarch-salamander_ps3.elf
 
-EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
-CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF
+EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
+CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
 
 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
 INCDIRS = -I. -Ips3 -Icommon
@@ -157,28 +157,28 @@ create-salamander:
 	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)
 
 copy-media-files:
-	@cp -r $(RMENU_IMG_DIR)/*.png ps3/pkg/USRDIR/cores/borders/Menu/
+	@cp -r $(RMENU_IMG_DIR)/*.png pkg/ps3/USRDIR/cores/borders/Menu/
 
 create-shaders:
 	make -f Makefile.shaders deploy-ps3
 
 pkg: $(PPU_TARGET)  create-shaders copy-media-files create-npdrm-salamander create-npdrm-core
-	$(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg
+	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3
 
 pkg-signed: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION).pkg
 
 pkg-signed-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
 	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION).pkg
 
 pkg-signed-cfw: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
 	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
 
 pkg-signed-cfw-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
 	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION).pkg
 	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
 
 clean-selfs:
diff --git a/Makefile.psl1ght b/Makefile.psl1ght
index 85ddec7938..2d36fb4638 100644
--- a/Makefile.psl1ght
+++ b/Makefile.psl1ght
@@ -14,8 +14,8 @@ LD = $(PS3DEV)/ppu/bin/ppu-ld
 CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
 
 ELF_TARGET := retroarch_psl1ght.elf
-EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
-CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF
+EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
+CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
 
 INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/zlib -Ips3/gcmgl/include/export -Ips3/include
 LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.
@@ -119,10 +119,10 @@ create-core:
 	$(MAKE_SELF_WC) $(ELF_TARGET) $(CORE_PATH)
 
 pkg: $(ELF_TARGET) create-npdrm-core
-	$(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg
+	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf ps3/pkg
 
 pkg-signed: $(ELF_TARGET) create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION).pkg
 
 clean:
 	rm -f $(ELF_TARGET)
diff --git a/ps3/pkg/ICON0.PNG b/pkg/ps3/ICON0.PNG
similarity index 100%
rename from ps3/pkg/ICON0.PNG
rename to pkg/ps3/ICON0.PNG
diff --git a/ps3/pkg/PARAM.SFO b/pkg/ps3/PARAM.SFO
similarity index 100%
rename from ps3/pkg/PARAM.SFO
rename to pkg/ps3/PARAM.SFO
diff --git a/ps3/pkg/USRDIR/.empty b/pkg/ps3/USRDIR/.empty
similarity index 100%
rename from ps3/pkg/USRDIR/.empty
rename to pkg/ps3/USRDIR/.empty
diff --git a/ps3/pkg/USRDIR/cores/.empty b/pkg/ps3/USRDIR/cores/.empty
similarity index 100%
rename from ps3/pkg/USRDIR/cores/.empty
rename to pkg/ps3/USRDIR/cores/.empty
diff --git a/ps3/pkg/USRDIR/cores/borders/Menu/.empty b/pkg/ps3/USRDIR/cores/presets/.empty
similarity index 100%
rename from ps3/pkg/USRDIR/cores/borders/Menu/.empty
rename to pkg/ps3/USRDIR/cores/presets/.empty
diff --git a/ps3/pkg/USRDIR/cores/presets/.empty b/pkg/ps3/USRDIR/cores/savestates/.empty
similarity index 100%
rename from ps3/pkg/USRDIR/cores/presets/.empty
rename to pkg/ps3/USRDIR/cores/savestates/.empty
diff --git a/ps3/pkg/USRDIR/cores/savestates/.empty b/pkg/ps3/USRDIR/cores/sram/.empty
similarity index 100%
rename from ps3/pkg/USRDIR/cores/savestates/.empty
rename to pkg/ps3/USRDIR/cores/sram/.empty
diff --git a/ps3/pkg/USRDIR/cores/sram/.empty b/pkg/ps3/USRDIR/cores/system/.empty
similarity index 100%
rename from ps3/pkg/USRDIR/cores/sram/.empty
rename to pkg/ps3/USRDIR/cores/system/.empty
diff --git a/ps3/pkg/package.conf b/pkg/ps3/package.conf
similarity index 100%
rename from ps3/pkg/package.conf
rename to pkg/ps3/package.conf
diff --git a/ps3/pkg/USRDIR/cores/borders/Menu/captain-cpsx.png b/ps3/pkg/USRDIR/cores/borders/Menu/captain-cpsx.png
deleted file mode 100644
index f9f6e34946..0000000000
Binary files a/ps3/pkg/USRDIR/cores/borders/Menu/captain-cpsx.png and /dev/null differ
diff --git a/ps3/pkg/USRDIR/cores/system/.empty b/ps3/pkg/USRDIR/cores/system/.empty
deleted file mode 100644
index e69de29bb2..0000000000