diff --git a/sourcepawn/jit/x86/msvc8/jit-x86.sln b/sourcepawn/jit/msvc8/jit-x86.sln
similarity index 100%
rename from sourcepawn/jit/x86/msvc8/jit-x86.sln
rename to sourcepawn/jit/msvc8/jit-x86.sln
diff --git a/sourcepawn/jit/x86/msvc8/jit-x86.vcproj b/sourcepawn/jit/msvc8/jit-x86.vcproj
similarity index 100%
rename from sourcepawn/jit/x86/msvc8/jit-x86.vcproj
rename to sourcepawn/jit/msvc8/jit-x86.vcproj
diff --git a/core/vm/sp_vm_basecontext.cpp b/sourcepawn/jit/sp_vm_basecontext.cpp
similarity index 100%
rename from core/vm/sp_vm_basecontext.cpp
rename to sourcepawn/jit/sp_vm_basecontext.cpp
diff --git a/core/vm/sp_vm_basecontext.h b/sourcepawn/jit/sp_vm_basecontext.h
similarity index 100%
rename from core/vm/sp_vm_basecontext.h
rename to sourcepawn/jit/sp_vm_basecontext.h
diff --git a/core/vm/sp_vm_engine.cpp b/sourcepawn/jit/sp_vm_engine.cpp
similarity index 100%
rename from core/vm/sp_vm_engine.cpp
rename to sourcepawn/jit/sp_vm_engine.cpp
diff --git a/core/vm/sp_vm_engine.h b/sourcepawn/jit/sp_vm_engine.h
similarity index 100%
rename from core/vm/sp_vm_engine.h
rename to sourcepawn/jit/sp_vm_engine.h
diff --git a/core/vm/sp_vm_function.cpp b/sourcepawn/jit/sp_vm_function.cpp
similarity index 100%
rename from core/vm/sp_vm_function.cpp
rename to sourcepawn/jit/sp_vm_function.cpp
diff --git a/core/vm/sp_vm_function.h b/sourcepawn/jit/sp_vm_function.h
similarity index 100%
rename from core/vm/sp_vm_function.h
rename to sourcepawn/jit/sp_vm_function.h
diff --git a/core/zlib/adler32.c b/sourcepawn/jit/zlib/adler32.c
similarity index 100%
rename from core/zlib/adler32.c
rename to sourcepawn/jit/zlib/adler32.c
diff --git a/core/zlib/compress.c b/sourcepawn/jit/zlib/compress.c
similarity index 100%
rename from core/zlib/compress.c
rename to sourcepawn/jit/zlib/compress.c
diff --git a/core/zlib/crc32.c b/sourcepawn/jit/zlib/crc32.c
similarity index 100%
rename from core/zlib/crc32.c
rename to sourcepawn/jit/zlib/crc32.c
diff --git a/core/zlib/crc32.h b/sourcepawn/jit/zlib/crc32.h
similarity index 100%
rename from core/zlib/crc32.h
rename to sourcepawn/jit/zlib/crc32.h
diff --git a/core/zlib/deflate.c b/sourcepawn/jit/zlib/deflate.c
similarity index 100%
rename from core/zlib/deflate.c
rename to sourcepawn/jit/zlib/deflate.c
diff --git a/core/zlib/deflate.h b/sourcepawn/jit/zlib/deflate.h
similarity index 100%
rename from core/zlib/deflate.h
rename to sourcepawn/jit/zlib/deflate.h
diff --git a/core/zlib/gzio.c b/sourcepawn/jit/zlib/gzio.c
similarity index 100%
rename from core/zlib/gzio.c
rename to sourcepawn/jit/zlib/gzio.c
diff --git a/core/zlib/infback.c b/sourcepawn/jit/zlib/infback.c
similarity index 100%
rename from core/zlib/infback.c
rename to sourcepawn/jit/zlib/infback.c
diff --git a/core/zlib/inffast.c b/sourcepawn/jit/zlib/inffast.c
similarity index 100%
rename from core/zlib/inffast.c
rename to sourcepawn/jit/zlib/inffast.c
diff --git a/core/zlib/inffast.h b/sourcepawn/jit/zlib/inffast.h
similarity index 100%
rename from core/zlib/inffast.h
rename to sourcepawn/jit/zlib/inffast.h
diff --git a/core/zlib/inffixed.h b/sourcepawn/jit/zlib/inffixed.h
similarity index 100%
rename from core/zlib/inffixed.h
rename to sourcepawn/jit/zlib/inffixed.h
diff --git a/core/zlib/inflate.c b/sourcepawn/jit/zlib/inflate.c
similarity index 100%
rename from core/zlib/inflate.c
rename to sourcepawn/jit/zlib/inflate.c
diff --git a/core/zlib/inflate.h b/sourcepawn/jit/zlib/inflate.h
similarity index 100%
rename from core/zlib/inflate.h
rename to sourcepawn/jit/zlib/inflate.h
diff --git a/core/zlib/inftrees.c b/sourcepawn/jit/zlib/inftrees.c
similarity index 100%
rename from core/zlib/inftrees.c
rename to sourcepawn/jit/zlib/inftrees.c
diff --git a/core/zlib/inftrees.h b/sourcepawn/jit/zlib/inftrees.h
similarity index 100%
rename from core/zlib/inftrees.h
rename to sourcepawn/jit/zlib/inftrees.h
diff --git a/core/zlib/trees.c b/sourcepawn/jit/zlib/trees.c
similarity index 100%
rename from core/zlib/trees.c
rename to sourcepawn/jit/zlib/trees.c
diff --git a/core/zlib/trees.h b/sourcepawn/jit/zlib/trees.h
similarity index 100%
rename from core/zlib/trees.h
rename to sourcepawn/jit/zlib/trees.h
diff --git a/core/zlib/uncompr.c b/sourcepawn/jit/zlib/uncompr.c
similarity index 100%
rename from core/zlib/uncompr.c
rename to sourcepawn/jit/zlib/uncompr.c
diff --git a/core/zlib/zconf.h b/sourcepawn/jit/zlib/zconf.h
similarity index 100%
rename from core/zlib/zconf.h
rename to sourcepawn/jit/zlib/zconf.h
diff --git a/core/zlib/zlib.h b/sourcepawn/jit/zlib/zlib.h
similarity index 100%
rename from core/zlib/zlib.h
rename to sourcepawn/jit/zlib/zlib.h
diff --git a/core/zlib/zutil.c b/sourcepawn/jit/zlib/zutil.c
similarity index 100%
rename from core/zlib/zutil.c
rename to sourcepawn/jit/zlib/zutil.c
diff --git a/core/zlib/zutil.h b/sourcepawn/jit/zlib/zutil.h
similarity index 100%
rename from core/zlib/zutil.h
rename to sourcepawn/jit/zlib/zutil.h