diff --git a/zscript/vm.h b/src/zscript/vm.h
similarity index 94%
rename from zscript/vm.h
rename to src/zscript/vm.h
index ee20d3ceb..6755290c7 100644
--- a/zscript/vm.h
+++ b/src/zscript/vm.h
@@ -763,7 +763,7 @@ public:
 		RegA++;
 	}
 
-	void ParamPointer(void *ptr, VM_UBTYE atag)
+	void ParamPointer(void *ptr, VM_UBYTE atag)
 	{
 		Reg.a[RegA] = ptr;
 		Reg.atag[RegA] = atag;
diff --git a/zscript/vmdisasm.cpp b/src/zscript/vmdisasm.cpp
similarity index 100%
rename from zscript/vmdisasm.cpp
rename to src/zscript/vmdisasm.cpp
diff --git a/zscript/vmexec.cpp b/src/zscript/vmexec.cpp
similarity index 100%
rename from zscript/vmexec.cpp
rename to src/zscript/vmexec.cpp
diff --git a/zscript/vmexec.h b/src/zscript/vmexec.h
similarity index 100%
rename from zscript/vmexec.h
rename to src/zscript/vmexec.h
diff --git a/zscript/vmframe.cpp b/src/zscript/vmframe.cpp
similarity index 100%
rename from zscript/vmframe.cpp
rename to src/zscript/vmframe.cpp
diff --git a/zscript/vmops.h b/src/zscript/vmops.h
similarity index 100%
rename from zscript/vmops.h
rename to src/zscript/vmops.h
diff --git a/zdoom.vcproj b/zdoom.vcproj
index a416fa6a8..9ee25f594 100644
--- a/zdoom.vcproj
+++ b/zdoom.vcproj
@@ -56,7 +56,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;"jpeg-6b";game-music-emu\gme;gdtoa;bzip2;lzma\C"
+				AdditionalIncludeDirectories="src\zscript;src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;"jpeg-6b";game-music-emu\gme;gdtoa;bzip2;lzma\C"
 				PreprocessorDefinitions="NDEBUG,WIN32,_WIN32,_WINDOWS,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -177,7 +177,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;"jpeg-6b";game-music-emu\gme;gdtoa;bzip2;lzma\C"
+				AdditionalIncludeDirectories="src\zscript;src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;"jpeg-6b";game-music-emu\gme;gdtoa;bzip2;lzma\C"
 				PreprocessorDefinitions="NDEBUG,WIN32,_WIN32,_WINDOWS,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;&quot;jpeg-6b&quot;;game-music-emu\gme;gdtoa;bzip2;lzma\C"
+				AdditionalIncludeDirectories="src\zscript;src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;&quot;jpeg-6b&quot;;game-music-emu\gme;gdtoa;bzip2;lzma\C"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WIN32,_WINDOWS,_CRTDBG_MAP_ALLOC,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -392,7 +392,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;&quot;jpeg-6b&quot;;game-music-emu\gme;gdtoa;bzip2;lzma\C"
+				AdditionalIncludeDirectories="src\zscript;src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;&quot;jpeg-6b&quot;;game-music-emu\gme;gdtoa;bzip2;lzma\C"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WIN32,_WINDOWS,_CRTDBG_MAP_ALLOC,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -6450,27 +6450,27 @@
 			Name="ZScript"
 			>
 			<File
-				RelativePath=".\zscript\vm.h"
+				RelativePath=".\src\zscript\vm.h"
 				>
 			</File>
 			<File
-				RelativePath=".\zscript\vmdisasm.cpp"
+				RelativePath=".\src\zscript\vmdisasm.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\zscript\vmexec.cpp"
+				RelativePath=".\src\zscript\vmexec.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\zscript\vmexec.h"
+				RelativePath=".\src\zscript\vmexec.h"
 				>
 			</File>
 			<File
-				RelativePath=".\zscript\vmframe.cpp"
+				RelativePath=".\src\zscript\vmframe.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\zscript\vmops.h"
+				RelativePath=".\src\zscript\vmops.h"
 				>
 			</File>
 		</Filter>