diff --git a/src_rebuild/EMULATOR/ABS.C b/src_rebuild/PsyX/ABS.C
similarity index 100%
rename from src_rebuild/EMULATOR/ABS.C
rename to src_rebuild/PsyX/ABS.C
diff --git a/src_rebuild/EMULATOR/ABS.H b/src_rebuild/PsyX/ABS.H
similarity index 100%
rename from src_rebuild/EMULATOR/ABS.H
rename to src_rebuild/PsyX/ABS.H
diff --git a/src_rebuild/EMULATOR/ASM.H b/src_rebuild/PsyX/ASM.H
similarity index 100%
rename from src_rebuild/EMULATOR/ASM.H
rename to src_rebuild/PsyX/ASM.H
diff --git a/src_rebuild/EMULATOR/CRASHHANDLER.C b/src_rebuild/PsyX/CRASHHANDLER.C
similarity index 100%
rename from src_rebuild/EMULATOR/CRASHHANDLER.C
rename to src_rebuild/PsyX/CRASHHANDLER.C
diff --git a/src_rebuild/EMULATOR/CRASHHANDLER.H b/src_rebuild/PsyX/CRASHHANDLER.H
similarity index 100%
rename from src_rebuild/EMULATOR/CRASHHANDLER.H
rename to src_rebuild/PsyX/CRASHHANDLER.H
diff --git a/src_rebuild/EMULATOR/EMULATOR.C b/src_rebuild/PsyX/EMULATOR.C
similarity index 99%
rename from src_rebuild/EMULATOR/EMULATOR.C
rename to src_rebuild/PsyX/EMULATOR.C
index 7056f1d2..860e102f 100644
--- a/src_rebuild/EMULATOR/EMULATOR.C
+++ b/src_rebuild/PsyX/EMULATOR.C
@@ -266,7 +266,7 @@ static int Emulator_InitialiseSDL(char* windowName, int width, int height, int f
 	return TRUE;
 }
 
-static int Emulator_InitialiseGLEW()
+static int Emulator_InitialiseGLExt()
 {
 #if defined(GLEW)
 	GLenum err = gladLoadGL();
@@ -379,7 +379,7 @@ static int Emulator_InitialiseCore()
 
 void Emulator_Initialise(char* windowName, int width, int height, int fullscreen)
 {
-	eprintf("Initialising Emulator.\n");
+	eprintf("Initialising Psy-X (Psy-Cross).\n");
 	eprintf("VERSION: %d.%d\n", EMULATOR_MAJOR_VERSION, EMULATOR_MINOR_VERSION);
 	eprintf("Compile Date: %s Time: %s\n", EMULATOR_COMPILE_DATE, EMULATOR_COMPILE_TIME);
 
@@ -390,16 +390,16 @@ void Emulator_Initialise(char* windowName, int width, int height, int fullscreen
 	}
 
 #if defined(GLEW)
-	if (Emulator_InitialiseGLEW() == FALSE)
+	if (Emulator_InitialiseGLExt() == FALSE)
 	{
-		eprinterr("Failed to Intialise GLEW\n");
+		eprinterr("Failed to Intialise GL extensions\n");
 		Emulator_ShutDown();
 	}
 #endif
 
 	if (Emulator_InitialiseCore() == FALSE)
 	{
-		eprinterr("Failed to Intialise Emulator Core.\n");
+		eprinterr("Failed to Intialise Psy-X Core.\n");
 		Emulator_ShutDown();
 	}
 
diff --git a/src_rebuild/EMULATOR/EMULATOR.H b/src_rebuild/PsyX/EMULATOR.H
similarity index 98%
rename from src_rebuild/EMULATOR/EMULATOR.H
rename to src_rebuild/PsyX/EMULATOR.H
index a0f71d99..3705e81a 100644
--- a/src_rebuild/EMULATOR/EMULATOR.H
+++ b/src_rebuild/PsyX/EMULATOR.H
@@ -36,11 +36,11 @@
 
 #if defined(__ANDROID__)
 #include <android/log.h>
-#define LOG_TAG_EMU "[EMU] "
+#define LOG_TAG_EMU "[PsyX] "
 #define eprintf(fmt, ...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG_EMU, fmt, ##__VA_ARGS__)
 #define eprinterr(fmt, ...) eprintf("[%s] - " fmt, FUNCNAME, ##__VA_ARGS__);
 #else
-#define eprintf(fmt, ...) printf("[EMU] " fmt, ##__VA_ARGS__)
+#define eprintf(fmt, ...) printf("[Psy-X] " fmt, ##__VA_ARGS__)
 #define eprinterr(fmt, ...) eprintf("[%s] - " fmt, FUNCNAME, ##__VA_ARGS__);
 #endif
 
diff --git a/src_rebuild/EMULATOR/EMULATOR_GLOBALS.H b/src_rebuild/PsyX/EMULATOR_GLOBALS.H
similarity index 95%
rename from src_rebuild/EMULATOR/EMULATOR_GLOBALS.H
rename to src_rebuild/PsyX/EMULATOR_GLOBALS.H
index d0c4fab4..f33b9d5a 100644
--- a/src_rebuild/EMULATOR/EMULATOR_GLOBALS.H
+++ b/src_rebuild/PsyX/EMULATOR_GLOBALS.H
@@ -2,7 +2,7 @@
 #define EMULATOR_GLOBALS_H
 
 #include <SDL_gamecontroller.h>
-#include <EMULATOR.H>
+#include "EMULATOR.H"
 
 extern TextureID        whiteTexture;
 extern TextureID        vramTexture;
diff --git a/src_rebuild/EMULATOR/EMULATOR_PLATFORM_SETUP.H b/src_rebuild/PsyX/EMULATOR_PLATFORM_SETUP.H
similarity index 98%
rename from src_rebuild/EMULATOR/EMULATOR_PLATFORM_SETUP.H
rename to src_rebuild/PsyX/EMULATOR_PLATFORM_SETUP.H
index 12fe0bf7..da368d2e 100644
--- a/src_rebuild/EMULATOR/EMULATOR_PLATFORM_SETUP.H
+++ b/src_rebuild/PsyX/EMULATOR_PLATFORM_SETUP.H
@@ -37,7 +37,7 @@
 
 #if defined(GLEW)
 #define GL_GLEXT_PROTOTYPES 1
-#include <glad.h>
+#include "glad.h"
 #endif
 
 /*
diff --git a/src_rebuild/EMULATOR/EMULATOR_PRIVATE.H b/src_rebuild/PsyX/EMULATOR_PRIVATE.H
similarity index 100%
rename from src_rebuild/EMULATOR/EMULATOR_PRIVATE.H
rename to src_rebuild/PsyX/EMULATOR_PRIVATE.H
diff --git a/src_rebuild/EMULATOR/EMULATOR_SETUP.H b/src_rebuild/PsyX/EMULATOR_SETUP.H
similarity index 73%
rename from src_rebuild/EMULATOR/EMULATOR_SETUP.H
rename to src_rebuild/PsyX/EMULATOR_SETUP.H
index 87a7696d..0289b431 100644
--- a/src_rebuild/EMULATOR/EMULATOR_SETUP.H
+++ b/src_rebuild/PsyX/EMULATOR_SETUP.H
@@ -2,6 +2,6 @@
 #define EMULATOR_SETUP_H
 
 //Disc image filename to load for disc image builds
-#define DISC_IMAGE_FILENAME "TOMB5.CUE"
+#define DISC_IMAGE_FILENAME "IMAGE.CUE"
 
 #endif
\ No newline at end of file
diff --git a/src_rebuild/EMULATOR/EMULATOR_TIMER.C b/src_rebuild/PsyX/EMULATOR_TIMER.C
similarity index 100%
rename from src_rebuild/EMULATOR/EMULATOR_TIMER.C
rename to src_rebuild/PsyX/EMULATOR_TIMER.C
diff --git a/src_rebuild/EMULATOR/EMULATOR_TIMER.H b/src_rebuild/PsyX/EMULATOR_TIMER.H
similarity index 100%
rename from src_rebuild/EMULATOR/EMULATOR_TIMER.H
rename to src_rebuild/PsyX/EMULATOR_TIMER.H
diff --git a/src_rebuild/EMULATOR/EMULATOR_VERSION.H b/src_rebuild/PsyX/EMULATOR_VERSION.H
similarity index 90%
rename from src_rebuild/EMULATOR/EMULATOR_VERSION.H
rename to src_rebuild/PsyX/EMULATOR_VERSION.H
index 6d97a5b2..99c5c7b4 100644
--- a/src_rebuild/EMULATOR/EMULATOR_VERSION.H
+++ b/src_rebuild/PsyX/EMULATOR_VERSION.H
@@ -6,7 +6,7 @@
 
 /* Emulator version */
 #define EMULATOR_MAJOR_VERSION (1)
-#define EMULATOR_MINOR_VERSION (101)
+#define EMULATOR_MINOR_VERSION (500)
 
 /* Compile date and time */
 #define EMULATOR_COMPILE_DATE (__DATE__)
diff --git a/src_rebuild/EMULATOR/GTE/half_float.cpp b/src_rebuild/PsyX/GTE/half_float.cpp
similarity index 100%
rename from src_rebuild/EMULATOR/GTE/half_float.cpp
rename to src_rebuild/PsyX/GTE/half_float.cpp
diff --git a/src_rebuild/EMULATOR/GTE/half_float.h b/src_rebuild/PsyX/GTE/half_float.h
similarity index 100%
rename from src_rebuild/EMULATOR/GTE/half_float.h
rename to src_rebuild/PsyX/GTE/half_float.h
diff --git a/src_rebuild/EMULATOR/GTE/ratan_tbl.h b/src_rebuild/PsyX/GTE/ratan_tbl.h
similarity index 100%
rename from src_rebuild/EMULATOR/GTE/ratan_tbl.h
rename to src_rebuild/PsyX/GTE/ratan_tbl.h
diff --git a/src_rebuild/EMULATOR/GTE/rcossin_tbl.h b/src_rebuild/PsyX/GTE/rcossin_tbl.h
similarity index 100%
rename from src_rebuild/EMULATOR/GTE/rcossin_tbl.h
rename to src_rebuild/PsyX/GTE/rcossin_tbl.h
diff --git a/src_rebuild/EMULATOR/GTE/sqrt_tbl.h b/src_rebuild/PsyX/GTE/sqrt_tbl.h
similarity index 100%
rename from src_rebuild/EMULATOR/GTE/sqrt_tbl.h
rename to src_rebuild/PsyX/GTE/sqrt_tbl.h
diff --git a/src_rebuild/EMULATOR/GTEREG.H b/src_rebuild/PsyX/GTEREG.H
similarity index 100%
rename from src_rebuild/EMULATOR/GTEREG.H
rename to src_rebuild/PsyX/GTEREG.H
diff --git a/src_rebuild/EMULATOR/INLINE_C.C b/src_rebuild/PsyX/INLINE_C.C
similarity index 100%
rename from src_rebuild/EMULATOR/INLINE_C.C
rename to src_rebuild/PsyX/INLINE_C.C
diff --git a/src_rebuild/EMULATOR/INLINE_C.H b/src_rebuild/PsyX/INLINE_C.H
similarity index 100%
rename from src_rebuild/EMULATOR/INLINE_C.H
rename to src_rebuild/PsyX/INLINE_C.H
diff --git a/src_rebuild/EMULATOR/KERNEL.H b/src_rebuild/PsyX/KERNEL.H
similarity index 100%
rename from src_rebuild/EMULATOR/KERNEL.H
rename to src_rebuild/PsyX/KERNEL.H
diff --git a/src_rebuild/EMULATOR/LIBAPI.C b/src_rebuild/PsyX/LIBAPI.C
similarity index 100%
rename from src_rebuild/EMULATOR/LIBAPI.C
rename to src_rebuild/PsyX/LIBAPI.C
diff --git a/src_rebuild/EMULATOR/LIBAPI.H b/src_rebuild/PsyX/LIBAPI.H
similarity index 100%
rename from src_rebuild/EMULATOR/LIBAPI.H
rename to src_rebuild/PsyX/LIBAPI.H
diff --git a/src_rebuild/EMULATOR/LIBCD.C b/src_rebuild/PsyX/LIBCD.C
similarity index 100%
rename from src_rebuild/EMULATOR/LIBCD.C
rename to src_rebuild/PsyX/LIBCD.C
diff --git a/src_rebuild/EMULATOR/LIBCD.H b/src_rebuild/PsyX/LIBCD.H
similarity index 100%
rename from src_rebuild/EMULATOR/LIBCD.H
rename to src_rebuild/PsyX/LIBCD.H
diff --git a/src_rebuild/EMULATOR/LIBETC.C b/src_rebuild/PsyX/LIBETC.C
similarity index 100%
rename from src_rebuild/EMULATOR/LIBETC.C
rename to src_rebuild/PsyX/LIBETC.C
diff --git a/src_rebuild/EMULATOR/LIBETC.H b/src_rebuild/PsyX/LIBETC.H
similarity index 100%
rename from src_rebuild/EMULATOR/LIBETC.H
rename to src_rebuild/PsyX/LIBETC.H
diff --git a/src_rebuild/EMULATOR/LIBGPU.C b/src_rebuild/PsyX/LIBGPU.C
similarity index 99%
rename from src_rebuild/EMULATOR/LIBGPU.C
rename to src_rebuild/PsyX/LIBGPU.C
index 65c1fdff..78fb441e 100644
--- a/src_rebuild/EMULATOR/LIBGPU.C
+++ b/src_rebuild/PsyX/LIBGPU.C
@@ -8,7 +8,7 @@
 
 #include <stdint.h>
 
-#include <LIBETC.H>
+#include "LIBETC.H"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src_rebuild/EMULATOR/LIBGPU.H b/src_rebuild/PsyX/LIBGPU.H
similarity index 100%
rename from src_rebuild/EMULATOR/LIBGPU.H
rename to src_rebuild/PsyX/LIBGPU.H
diff --git a/src_rebuild/EMULATOR/LIBGTE.C b/src_rebuild/PsyX/LIBGTE.C
similarity index 100%
rename from src_rebuild/EMULATOR/LIBGTE.C
rename to src_rebuild/PsyX/LIBGTE.C
diff --git a/src_rebuild/EMULATOR/LIBGTE.H b/src_rebuild/PsyX/LIBGTE.H
similarity index 100%
rename from src_rebuild/EMULATOR/LIBGTE.H
rename to src_rebuild/PsyX/LIBGTE.H
diff --git a/src_rebuild/EMULATOR/LIBMATH.H b/src_rebuild/PsyX/LIBMATH.H
similarity index 100%
rename from src_rebuild/EMULATOR/LIBMATH.H
rename to src_rebuild/PsyX/LIBMATH.H
diff --git a/src_rebuild/EMULATOR/LIBMCRD.C b/src_rebuild/PsyX/LIBMCRD.C
similarity index 100%
rename from src_rebuild/EMULATOR/LIBMCRD.C
rename to src_rebuild/PsyX/LIBMCRD.C
diff --git a/src_rebuild/EMULATOR/LIBMCRD.H b/src_rebuild/PsyX/LIBMCRD.H
similarity index 100%
rename from src_rebuild/EMULATOR/LIBMCRD.H
rename to src_rebuild/PsyX/LIBMCRD.H
diff --git a/src_rebuild/EMULATOR/LIBPAD.C b/src_rebuild/PsyX/LIBPAD.C
similarity index 100%
rename from src_rebuild/EMULATOR/LIBPAD.C
rename to src_rebuild/PsyX/LIBPAD.C
diff --git a/src_rebuild/EMULATOR/LIBPAD.H b/src_rebuild/PsyX/LIBPAD.H
similarity index 100%
rename from src_rebuild/EMULATOR/LIBPAD.H
rename to src_rebuild/PsyX/LIBPAD.H
diff --git a/src_rebuild/EMULATOR/LIBSN.C b/src_rebuild/PsyX/LIBSN.C
similarity index 100%
rename from src_rebuild/EMULATOR/LIBSN.C
rename to src_rebuild/PsyX/LIBSN.C
diff --git a/src_rebuild/EMULATOR/LIBSN.H b/src_rebuild/PsyX/LIBSN.H
similarity index 100%
rename from src_rebuild/EMULATOR/LIBSN.H
rename to src_rebuild/PsyX/LIBSN.H
diff --git a/src_rebuild/EMULATOR/LIBSPU.C b/src_rebuild/PsyX/LIBSPU.C
similarity index 100%
rename from src_rebuild/EMULATOR/LIBSPU.C
rename to src_rebuild/PsyX/LIBSPU.C
diff --git a/src_rebuild/EMULATOR/LIBSPU.H b/src_rebuild/PsyX/LIBSPU.H
similarity index 100%
rename from src_rebuild/EMULATOR/LIBSPU.H
rename to src_rebuild/PsyX/LIBSPU.H
diff --git a/src_rebuild/EMULATOR/PGXP_DEFS.H b/src_rebuild/PsyX/PGXP_DEFS.H
similarity index 100%
rename from src_rebuild/EMULATOR/PGXP_DEFS.H
rename to src_rebuild/PsyX/PGXP_DEFS.H
diff --git a/src_rebuild/EMULATOR/R3000.H b/src_rebuild/PsyX/R3000.H
similarity index 100%
rename from src_rebuild/EMULATOR/R3000.H
rename to src_rebuild/PsyX/R3000.H
diff --git a/src_rebuild/EMULATOR/RAND.H b/src_rebuild/PsyX/RAND.H
similarity index 100%
rename from src_rebuild/EMULATOR/RAND.H
rename to src_rebuild/PsyX/RAND.H
diff --git a/src_rebuild/EMULATOR/STRINGS.H b/src_rebuild/PsyX/STRINGS.H
similarity index 100%
rename from src_rebuild/EMULATOR/STRINGS.H
rename to src_rebuild/PsyX/STRINGS.H
diff --git a/src_rebuild/EMULATOR/TYPES.H b/src_rebuild/PsyX/TYPES.H
similarity index 100%
rename from src_rebuild/EMULATOR/TYPES.H
rename to src_rebuild/PsyX/TYPES.H
diff --git a/src_rebuild/EMULATOR/glad.c b/src_rebuild/PsyX/glad.c
similarity index 100%
rename from src_rebuild/EMULATOR/glad.c
rename to src_rebuild/PsyX/glad.c
diff --git a/src_rebuild/EMULATOR/glad.h b/src_rebuild/PsyX/glad.h
similarity index 100%
rename from src_rebuild/EMULATOR/glad.h
rename to src_rebuild/PsyX/glad.h
diff --git a/src_rebuild/premake_emulator.lua b/src_rebuild/PsyX/premake5.lua
similarity index 80%
rename from src_rebuild/premake_emulator.lua
rename to src_rebuild/PsyX/premake5.lua
index a8070a07..8d346ee5 100644
--- a/src_rebuild/premake_emulator.lua
+++ b/src_rebuild/PsyX/premake5.lua
@@ -1,25 +1,21 @@
 
--- EMULATOR layer
-project "PSX"
+-- Psy-X (Psy-Cross) layer
+project "Psy-X"
     kind "StaticLib"
     language "C++"
     compileas "C++"
     targetdir "bin/%{cfg.buildcfg}"
 	removeplatforms "psx" 
 
-    includedirs { 
-        "EMULATOR"
-    }
-
     defines { GAME_REGION }
 
     files {
-        "EMULATOR/**.h", 
-        "EMULATOR/**.H", 
-        "EMULATOR/**.c", 
-        "EMULATOR/**.C", 
-        "EMULATOR/**.cpp",
-        "EMULATOR/**.CPP",
+        "**.h", 
+        "**.H", 
+        "**.c", 
+        "**.C", 
+        "**.cpp",
+        "**.CPP",
     }
 
     defines {  }
diff --git a/src_rebuild/gen_vc2019.bat b/src_rebuild/gen_vc2019.bat
index fc462e1b..aac5eb41 100644
--- a/src_rebuild/gen_vc2019.bat
+++ b/src_rebuild/gen_vc2019.bat
@@ -1,2 +1,5 @@
+set SDL2_DIR=%cd%\dependencies\SDL2
+set OPENAL_DIR=%cd%\dependencies\openal-soft
+set JPEG_DIR=%cd%\dependencies\jpeg
 premake5 vs2019
 pause
\ No newline at end of file
diff --git a/src_rebuild/premake5.lua b/src_rebuild/premake5.lua
index 77dad01a..88d00379 100644
--- a/src_rebuild/premake5.lua
+++ b/src_rebuild/premake5.lua
@@ -44,7 +44,7 @@ workspace "REDRIVER2"
 	end
 	
 	if os.target() ~= "psx" then
-		dofile("premake_emulator.lua")
+		dofile("PsyX/premake5.lua")
 	end
 	
 -- TODO: overlays
@@ -81,11 +81,11 @@ project "REDRIVER2"
 
     filter "system:Windows or linux"
         defines { "OGL", "SIMPLE_SPOOL" }
-        dependson { "PSX" }
-        links { "PSX", "jpeg" }
+        dependson { "PsyX" }
+        links { "Psy-X", "jpeg" }
 		
 		includedirs { 
-			"EMULATOR"
+			"PsyX"
 		}
 		
 		files {
diff --git a/src_rebuild/redriver2_psxpc.cpp b/src_rebuild/redriver2_psxpc.cpp
index 45700b94..d5c3bf3b 100644
--- a/src_rebuild/redriver2_psxpc.cpp
+++ b/src_rebuild/redriver2_psxpc.cpp
@@ -478,7 +478,7 @@ int main(int argc, char** argv)
 
 	
 
-	Emulator_Initialise("DRIVER2", windowWidth, windowHeight, fullScreen);
+	Emulator_Initialise("REDRIVER2", windowWidth, windowHeight, fullScreen);
 	redriver2_main(argc, argv);
 
 	Emulator_ShutDown();