diff --git a/CodeGen/src/typedefs.py b/CodeGen/src/typedefs.py
index 24403e1f..207b2b5b 100644
--- a/CodeGen/src/typedefs.py
+++ b/CodeGen/src/typedefs.py
@@ -152,9 +152,9 @@ def main(parser):
     with open("templates/typetemplate.txt", "r") as f:
         template = f.read()
 
-    for root, directories, filenames in os.walk('CustomTypes/'):
+    for root, directories, filenames in os.walk('templates/custom_types/'):
         for filename in filenames:
-            outputdir = "../com.rlabrecque.steamworks.net/Runtime/types/" + root[len('CustomTypes/'):]
+            outputdir = "../com.rlabrecque.steamworks.net/Runtime/types/" + root[len('templates/custom_types/'):]
             try:
                 os.makedirs(outputdir)
             except OSError:
diff --git a/CodeGen/CustomTypes/MatchmakingTypes/gameserveritem_t.cs b/CodeGen/templates/custom_types/MatchmakingTypes/gameserveritem_t.cs
similarity index 100%
rename from CodeGen/CustomTypes/MatchmakingTypes/gameserveritem_t.cs
rename to CodeGen/templates/custom_types/MatchmakingTypes/gameserveritem_t.cs
diff --git a/CodeGen/CustomTypes/MatchmakingTypes/servernetadr_t.cs b/CodeGen/templates/custom_types/MatchmakingTypes/servernetadr_t.cs
similarity index 100%
rename from CodeGen/CustomTypes/MatchmakingTypes/servernetadr_t.cs
rename to CodeGen/templates/custom_types/MatchmakingTypes/servernetadr_t.cs
diff --git a/CodeGen/CustomTypes/SteamClient/SteamAPIWarningMessageHook_t.cs b/CodeGen/templates/custom_types/SteamClient/SteamAPIWarningMessageHook_t.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamClient/SteamAPIWarningMessageHook_t.cs
rename to CodeGen/templates/custom_types/SteamClient/SteamAPIWarningMessageHook_t.cs
diff --git a/CodeGen/CustomTypes/SteamClient/SteamAPI_CheckCallbackRegistered_t.cs b/CodeGen/templates/custom_types/SteamClient/SteamAPI_CheckCallbackRegistered_t.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamClient/SteamAPI_CheckCallbackRegistered_t.cs
rename to CodeGen/templates/custom_types/SteamClient/SteamAPI_CheckCallbackRegistered_t.cs
diff --git a/CodeGen/CustomTypes/SteamClientPublic/CGameID.cs b/CodeGen/templates/custom_types/SteamClientPublic/CGameID.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamClientPublic/CGameID.cs
rename to CodeGen/templates/custom_types/SteamClientPublic/CGameID.cs
diff --git a/CodeGen/CustomTypes/SteamClientPublic/CSteamID.cs b/CodeGen/templates/custom_types/SteamClientPublic/CSteamID.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamClientPublic/CSteamID.cs
rename to CodeGen/templates/custom_types/SteamClientPublic/CSteamID.cs
diff --git a/CodeGen/CustomTypes/SteamDatagramTickets/SteamDatagramHostedAddress.cs b/CodeGen/templates/custom_types/SteamDatagramTickets/SteamDatagramHostedAddress.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamDatagramTickets/SteamDatagramHostedAddress.cs
rename to CodeGen/templates/custom_types/SteamDatagramTickets/SteamDatagramHostedAddress.cs
diff --git a/CodeGen/CustomTypes/SteamDatagramTickets/SteamDatagramRelayAuthTicket.cs b/CodeGen/templates/custom_types/SteamDatagramTickets/SteamDatagramRelayAuthTicket.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamDatagramTickets/SteamDatagramRelayAuthTicket.cs
rename to CodeGen/templates/custom_types/SteamDatagramTickets/SteamDatagramRelayAuthTicket.cs
diff --git a/CodeGen/CustomTypes/SteamInput/SteamInputActionEventCallbackPointer.cs b/CodeGen/templates/custom_types/SteamInput/SteamInputActionEventCallbackPointer.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamInput/SteamInputActionEventCallbackPointer.cs
rename to CodeGen/templates/custom_types/SteamInput/SteamInputActionEventCallbackPointer.cs
diff --git a/CodeGen/CustomTypes/SteamInput/SteamInputActionEvent_t.cs b/CodeGen/templates/custom_types/SteamInput/SteamInputActionEvent_t.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamInput/SteamInputActionEvent_t.cs
rename to CodeGen/templates/custom_types/SteamInput/SteamInputActionEvent_t.cs
diff --git a/CodeGen/CustomTypes/SteamNetworkingSockets/ISteamNetworkingConnectionSignaling.cs b/CodeGen/templates/custom_types/SteamNetworkingSockets/ISteamNetworkingConnectionSignaling.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamNetworkingSockets/ISteamNetworkingConnectionSignaling.cs
rename to CodeGen/templates/custom_types/SteamNetworkingSockets/ISteamNetworkingConnectionSignaling.cs
diff --git a/CodeGen/CustomTypes/SteamNetworkingSockets/ISteamNetworkingSignalingRecvContext.cs b/CodeGen/templates/custom_types/SteamNetworkingSockets/ISteamNetworkingSignalingRecvContext.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamNetworkingSockets/ISteamNetworkingSignalingRecvContext.cs
rename to CodeGen/templates/custom_types/SteamNetworkingSockets/ISteamNetworkingSignalingRecvContext.cs
diff --git a/CodeGen/CustomTypes/SteamNetworkingTypes/FSteamNetworkingSocketsDebugOutput.cs b/CodeGen/templates/custom_types/SteamNetworkingTypes/FSteamNetworkingSocketsDebugOutput.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamNetworkingTypes/FSteamNetworkingSocketsDebugOutput.cs
rename to CodeGen/templates/custom_types/SteamNetworkingTypes/FSteamNetworkingSocketsDebugOutput.cs
diff --git a/CodeGen/CustomTypes/SteamNetworkingTypes/SteamNetworkingConfigValue_t.cs b/CodeGen/templates/custom_types/SteamNetworkingTypes/SteamNetworkingConfigValue_t.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamNetworkingTypes/SteamNetworkingConfigValue_t.cs
rename to CodeGen/templates/custom_types/SteamNetworkingTypes/SteamNetworkingConfigValue_t.cs
diff --git a/CodeGen/CustomTypes/SteamNetworkingTypes/SteamNetworkingErrMsg.cs b/CodeGen/templates/custom_types/SteamNetworkingTypes/SteamNetworkingErrMsg.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamNetworkingTypes/SteamNetworkingErrMsg.cs
rename to CodeGen/templates/custom_types/SteamNetworkingTypes/SteamNetworkingErrMsg.cs
diff --git a/CodeGen/CustomTypes/SteamNetworkingTypes/SteamNetworkingIPAddr.cs b/CodeGen/templates/custom_types/SteamNetworkingTypes/SteamNetworkingIPAddr.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamNetworkingTypes/SteamNetworkingIPAddr.cs
rename to CodeGen/templates/custom_types/SteamNetworkingTypes/SteamNetworkingIPAddr.cs
diff --git a/CodeGen/CustomTypes/SteamNetworkingTypes/SteamNetworkingIdentity.cs b/CodeGen/templates/custom_types/SteamNetworkingTypes/SteamNetworkingIdentity.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamNetworkingTypes/SteamNetworkingIdentity.cs
rename to CodeGen/templates/custom_types/SteamNetworkingTypes/SteamNetworkingIdentity.cs
diff --git a/CodeGen/CustomTypes/SteamNetworkingTypes/SteamNetworkingMessage_t.cs b/CodeGen/templates/custom_types/SteamNetworkingTypes/SteamNetworkingMessage_t.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamNetworkingTypes/SteamNetworkingMessage_t.cs
rename to CodeGen/templates/custom_types/SteamNetworkingTypes/SteamNetworkingMessage_t.cs
diff --git a/CodeGen/CustomTypes/SteamTypes/SteamIPAddress_t.cs b/CodeGen/templates/custom_types/SteamTypes/SteamIPAddress_t.cs
similarity index 100%
rename from CodeGen/CustomTypes/SteamTypes/SteamIPAddress_t.cs
rename to CodeGen/templates/custom_types/SteamTypes/SteamIPAddress_t.cs