diff --git a/.gitmodules b/.gitmodules
index 1a810da..b8fbfa6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,5 +5,5 @@
 	path = hl2sdk-manifests
 	url = https://github.com/alliedmodders/hl2sdk-manifests
 [submodule "core/khook"]
-	path = core/khook
+	path = third_party/khook
 	url = https://github.com/Kenzzer/KHook
\ No newline at end of file
diff --git a/AMBuildScript b/AMBuildScript
index 342bd17..2cb0785 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -371,7 +371,6 @@ BuildScripts = [
 ]
 if getattr(builder.options, 'enable_tests', False):
     BuildScripts += [
-        'core/sourcehook/test/AMBuilder',
         'loader/test/AMBuilder',
     ]
 
@@ -380,8 +379,7 @@ if builder.backend == 'amb2':
     'support/buildbot/PackageScript',
   ]
 
-builder.Build('core/khook/AMBuilder', { 'KHook': MMS })
-builder.Build('core/khook/third_party/safetyhook/AMBuilder', { 'SafetyHook': MMS })
+builder.Build(['third_party/khook/AMBuilder', 'third_party/khook/third_party/safetyhook/AMBuilder'], { 'KHook': MMS, 'SafetyHook': MMS })
 builder.Build(BuildScripts, { 'MMS': MMS })
 
 if builder.options.breakpad_dump:
diff --git a/core/AMBuilder b/core/AMBuilder
index cbd9b46..7f85bc2 100644
--- a/core/AMBuilder
+++ b/core/AMBuilder
@@ -7,7 +7,7 @@ for sdk_target in MMS.sdk_targets:
   
   name = 'metamod.' + sdk['extension']
   binary = MMS.HL2Library(builder, cxx, name, sdk)
-  binary.compiler.cxxincludes += [os.path.join(builder.sourcePath, 'core', 'khook', 'include')]
+  binary.compiler.cxxincludes += [os.path.join(builder.sourcePath, 'third_party', 'khook', 'include')]
 
   binary.compiler.defines += ['KHOOK_STANDALONE']
   for task in MMS.libkhook:
diff --git a/loader/AMBuilder b/loader/AMBuilder
index ee5c3dc..f5f1a38 100644
--- a/loader/AMBuilder
+++ b/loader/AMBuilder
@@ -4,7 +4,7 @@ import os.path
 def configure_library(cxx, name, linux_defines):
   libname = name
   binary = MMS.Library(cxx, libname)
-  binary.compiler.cxxincludes += [os.path.join(builder.sourcePath, 'core', 'khook', 'include')]
+  binary.compiler.cxxincludes += [os.path.join(builder.sourcePath, 'third_party', 'khook', 'include')]
   binary.sources += [
     'loader.cpp',
     'gamedll.cpp',
diff --git a/core/khook b/third_party/khook
similarity index 100%
rename from core/khook
rename to third_party/khook