diff --git a/premake5.lua b/premake5.lua
index d59850d..0f0036b 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -45,13 +45,13 @@ workspace "doghook"
         targetdir "bin/%{cfg.buildcfg}"
 
         filter "system:linux"
-            pchheader "src/stdafx.hh"
+            pchheader "src/precompiled.hh"
         filter "system:windows"
-            pchheader "stdafx.hh"
+            pchheader "precompiled.hh"
         
         filter {}
 
-        pchsource "src/stdafx.cc"
+        pchsource "src/precompiled.cc"
 
 		includedirs { "src" }
         files { "src/**.hh", "src/**.cc" }
diff --git a/src/doghook.cc b/src/doghook.cc
index 4f0c452..988a3f2 100644
--- a/src/doghook.cc
+++ b/src/doghook.cc
@@ -1,18 +1,18 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
-#include "gamesystem.hh"
-#include "log.hh"
+#include "sdk/gamesystem.hh"
+#include "sdk/log.hh"
 
-#include "class_id.hh"
-#include "convar.hh"
-#include "hooks.hh"
-#include "interface.hh"
-#include "netvar.hh"
-#include "player.hh"
-#include "sdk.hh"
-#include "vfunc.hh"
+#include "sdk/class_id.hh"
+#include "sdk/convar.hh"
+#include "sdk/hooks.hh"
+#include "sdk/interface.hh"
+#include "sdk/netvar.hh"
+#include "sdk/player.hh"
+#include "sdk/sdk.hh"
+#include "sdk/vfunc.hh"
 
-#include "modules/createmove.hh"
+#include "hooks/createmove.hh"
 
 // Singleton for doing init / deinit of doghook
 // and dealing with hooks from gamesystem
diff --git a/src/modules/createmove.cc b/src/hooks/createmove.cc
similarity index 95%
rename from src/modules/createmove.cc
rename to src/hooks/createmove.cc
index 1f1cb3f..c493dba 100644
--- a/src/modules/createmove.cc
+++ b/src/hooks/createmove.cc
@@ -1,10 +1,10 @@
-#include <stdafx.hh>
+#include <precompiled.hh>
 
-#include "sdk.hh"
+#include "sdk/sdk.hh"
 
-#include "hooks.hh"
-#include "log.hh"
-#include "player.hh"
+#include "sdk/hooks.hh"
+#include "sdk/log.hh"
+#include "sdk/player.hh"
 
 using namespace sdk;
 
diff --git a/src/modules/createmove.hh b/src/hooks/createmove.hh
similarity index 100%
rename from src/modules/createmove.hh
rename to src/hooks/createmove.hh
diff --git a/src/main.cc b/src/main.cc
index 34c2653..c45b651 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #if doghook_platform_windows()
 
diff --git a/src/modules/moduleshere.txt b/src/modules/moduleshere.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/precompiled.cc b/src/precompiled.cc
new file mode 100644
index 0000000..7f82418
--- /dev/null
+++ b/src/precompiled.cc
@@ -0,0 +1 @@
+#include "precompiled.hh"
diff --git a/src/stdafx.hh b/src/precompiled.hh
similarity index 76%
rename from src/stdafx.hh
rename to src/precompiled.hh
index 355551c..ef70187 100644
--- a/src/stdafx.hh
+++ b/src/precompiled.hh
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "defer.hh"
-#include "platform.hh"
+#include "sdk/defer.hh"
+#include "sdk/platform.hh"
 
 #include <cassert>
 #include <cstdarg>
diff --git a/src/class_id.cc b/src/sdk/class_id.cc
similarity index 98%
rename from src/class_id.cc
rename to src/sdk/class_id.cc
index c49f127..499315b 100644
--- a/src/class_id.cc
+++ b/src/sdk/class_id.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #define PLACE_CHECKER
 
diff --git a/src/class_id.hh b/src/sdk/class_id.hh
similarity index 100%
rename from src/class_id.hh
rename to src/sdk/class_id.hh
diff --git a/src/convar.cc b/src/sdk/convar.cc
similarity index 99%
rename from src/convar.cc
rename to src/sdk/convar.cc
index ea74836..b343ec9 100644
--- a/src/convar.cc
+++ b/src/sdk/convar.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #include "convar.hh"
 
diff --git a/src/convar.hh b/src/sdk/convar.hh
similarity index 100%
rename from src/convar.hh
rename to src/sdk/convar.hh
diff --git a/src/datatable.hh b/src/sdk/datatable.hh
similarity index 100%
rename from src/datatable.hh
rename to src/sdk/datatable.hh
diff --git a/src/defer.hh b/src/sdk/defer.hh
similarity index 100%
rename from src/defer.hh
rename to src/sdk/defer.hh
diff --git a/src/entity.cc b/src/sdk/entity.cc
similarity index 97%
rename from src/entity.cc
rename to src/sdk/entity.cc
index 9502e11..d089890 100644
--- a/src/entity.cc
+++ b/src/sdk/entity.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #include "entity.hh"
 #include "player.hh"
diff --git a/src/entity.hh b/src/sdk/entity.hh
similarity index 100%
rename from src/entity.hh
rename to src/sdk/entity.hh
diff --git a/src/gamesystem.cc b/src/sdk/gamesystem.cc
similarity index 98%
rename from src/gamesystem.cc
rename to src/sdk/gamesystem.cc
index 8a0c231..adb9d95 100644
--- a/src/gamesystem.cc
+++ b/src/sdk/gamesystem.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #include "gamesystem.hh"
 #include "signature.hh"
diff --git a/src/gamesystem.hh b/src/sdk/gamesystem.hh
similarity index 100%
rename from src/gamesystem.hh
rename to src/sdk/gamesystem.hh
diff --git a/src/hooks.hh b/src/sdk/hooks.hh
similarity index 100%
rename from src/hooks.hh
rename to src/sdk/hooks.hh
diff --git a/src/interface.cc b/src/sdk/interface.cc
similarity index 97%
rename from src/interface.cc
rename to src/sdk/interface.cc
index 5b14625..3d2aa19 100644
--- a/src/interface.cc
+++ b/src/sdk/interface.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #include "interface.hh"
 #include "signature.hh"
diff --git a/src/interface.hh b/src/sdk/interface.hh
similarity index 100%
rename from src/interface.hh
rename to src/sdk/interface.hh
diff --git a/src/log.cc b/src/sdk/log.cc
similarity index 94%
rename from src/log.cc
rename to src/sdk/log.cc
index f227259..e4f3e5d 100644
--- a/src/log.cc
+++ b/src/sdk/log.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #include "log.hh"
 #include "signature.hh"
diff --git a/src/log.hh b/src/sdk/log.hh
similarity index 100%
rename from src/log.hh
rename to src/sdk/log.hh
diff --git a/src/netvar.cc b/src/sdk/netvar.cc
similarity index 98%
rename from src/netvar.cc
rename to src/sdk/netvar.cc
index f2fc83f..0e0a4dd 100644
--- a/src/netvar.cc
+++ b/src/sdk/netvar.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #include "interface.hh"
 #include "netvar.hh"
diff --git a/src/netvar.hh b/src/sdk/netvar.hh
similarity index 100%
rename from src/netvar.hh
rename to src/sdk/netvar.hh
diff --git a/src/platform.hh b/src/sdk/platform.hh
similarity index 100%
rename from src/platform.hh
rename to src/sdk/platform.hh
diff --git a/src/player.cc b/src/sdk/player.cc
similarity index 99%
rename from src/player.cc
rename to src/sdk/player.cc
index 8a50696..9c85abf 100644
--- a/src/player.cc
+++ b/src/sdk/player.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #include "player.hh"
 #include "weapon.hh"
diff --git a/src/player.hh b/src/sdk/player.hh
similarity index 100%
rename from src/player.hh
rename to src/sdk/player.hh
diff --git a/src/sdk.hh b/src/sdk/sdk.hh
similarity index 100%
rename from src/sdk.hh
rename to src/sdk/sdk.hh
diff --git a/src/signature.cc b/src/sdk/signature.cc
similarity index 99%
rename from src/signature.cc
rename to src/sdk/signature.cc
index 02f1487..aca5092 100644
--- a/src/signature.cc
+++ b/src/sdk/signature.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #include "signature.hh"
 
diff --git a/src/signature.hh b/src/sdk/signature.hh
similarity index 100%
rename from src/signature.hh
rename to src/sdk/signature.hh
diff --git a/src/trace.hh b/src/sdk/trace.hh
similarity index 100%
rename from src/trace.hh
rename to src/sdk/trace.hh
diff --git a/src/types.hh b/src/sdk/types.hh
similarity index 91%
rename from src/types.hh
rename to src/sdk/types.hh
index 90d08ff..f000a68 100644
--- a/src/types.hh
+++ b/src/sdk/types.hh
@@ -14,4 +14,4 @@ using i32  = int32_t;
 using i64  = int64_t;
 using iptr = intptr_t;
 
-#include "math.hh"
+#include "utils/math.hh"
diff --git a/src/vfunc.hh b/src/sdk/vfunc.hh
similarity index 100%
rename from src/vfunc.hh
rename to src/sdk/vfunc.hh
diff --git a/src/weapon.cc b/src/sdk/weapon.cc
similarity index 96%
rename from src/weapon.cc
rename to src/sdk/weapon.cc
index a0a2a36..40d6bde 100644
--- a/src/weapon.cc
+++ b/src/sdk/weapon.cc
@@ -1,4 +1,4 @@
-#include "stdafx.hh"
+#include "precompiled.hh"
 
 #include "interface.hh"
 #include "netvar.hh"
diff --git a/src/weapon.hh b/src/sdk/weapon.hh
similarity index 100%
rename from src/weapon.hh
rename to src/sdk/weapon.hh
diff --git a/src/stdafx.cc b/src/stdafx.cc
deleted file mode 100644
index 6571906..0000000
--- a/src/stdafx.cc
+++ /dev/null
@@ -1 +0,0 @@
-#include "stdafx.hh"
diff --git a/src/math.hh b/src/utils/math.hh
similarity index 99%
rename from src/math.hh
rename to src/utils/math.hh
index 4e6e91c..fdfe2ee 100644
--- a/src/math.hh
+++ b/src/utils/math.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "platform.hh"
+#include "sdk/platform.hh"
 
 #include <cassert>
 #include <cmath>