diff --git a/Makefile.ps3 b/Makefile.ps3
index ddccfd75a8..4bec6692c0 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -34,7 +34,7 @@ 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
+INCDIRS = -I. -Idefines -Ideps/zlib -Ilibretro-common/include
 
 # system platform
 system_platform = unix
@@ -47,7 +47,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
    system_platform = win
 endif
 
-PKG_SCRIPT		= ps3/ps3py/pkg.py
+PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
diff --git a/Makefile.ps3.cobra b/Makefile.ps3.cobra
index 873cce5e8d..bce87a24df 100644
--- a/Makefile.ps3.cobra
+++ b/Makefile.ps3.cobra
@@ -34,7 +34,7 @@ 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
+INCDIRS = -I. -Idefines
 
 # system platform
 system_platform = unix
@@ -47,7 +47,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
    system_platform = win
 endif
 
-PKG_SCRIPT		= ps3/ps3py/pkg.py
+PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
diff --git a/Makefile.psl1ght b/Makefile.psl1ght
index 2d36fb4638..3a15014ecd 100644
--- a/Makefile.psl1ght
+++ b/Makefile.psl1ght
@@ -36,7 +36,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
    system_platform = win
 endif
 
-PKG_SCRIPT		= ps3/ps3py/pkg.py
+PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
@@ -61,7 +61,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
    system_platform = win
 endif
 
-PKG_SCRIPT		= ps3/ps3py/pkg.py
+PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
diff --git a/ps3/include/sdk_version.h b/ps3/include/sdk_version.h
deleted file mode 100644
index c8fb95cd50..0000000000
--- a/ps3/include/sdk_version.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _PS3_SDK_VERSION
-#define _PS3_SDK_VERSION
-
-#ifndef __PSL1GHT__
-#include <sdk_version.h>
-#endif
-
-#endif
diff --git a/ps3/ps3py/crypt.c b/tools/ps3/ps3py/crypt.c
similarity index 100%
rename from ps3/ps3py/crypt.c
rename to tools/ps3/ps3py/crypt.c
diff --git a/ps3/ps3py/pkg.py b/tools/ps3/ps3py/pkg.py
similarity index 100%
rename from ps3/ps3py/pkg.py
rename to tools/ps3/ps3py/pkg.py
diff --git a/ps3/ps3py/setup.py b/tools/ps3/ps3py/setup.py
similarity index 100%
rename from ps3/ps3py/setup.py
rename to tools/ps3/ps3py/setup.py