diff --git a/addon_examples/backwards.py b/addon_examples/backwards.py
index 1d9a049..fac5d60 100644
--- a/addon_examples/backwards.py
+++ b/addon_examples/backwards.py
@@ -4,11 +4,11 @@ All buttons make you go backwards.
 Except for backward, which makes you go left.
 """
 
+from hippolyzer.lib.base.templates import AgentControlFlags
 from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.addon_utils import BaseAddon
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session
-from hippolyzer.lib.proxy.templates import AgentControlFlags
 
 
 NUDGE_MASK = sum(x for x in AgentControlFlags if "NUDGE" in x.name)
diff --git a/addon_examples/blueish_object_list.py b/addon_examples/blueish_object_list.py
index b85b56f..3ded8d7 100644
--- a/addon_examples/blueish_object_list.py
+++ b/addon_examples/blueish_object_list.py
@@ -17,6 +17,7 @@ from hippolyzer.lib.base.datatypes import Vector3
 from hippolyzer.lib.base.message.message import Block
 from hippolyzer.lib.base.objects import Object
 from hippolyzer.lib.base.ui_helpers import loadUi
+from hippolyzer.lib.base.templates import PCode
 from hippolyzer.lib.proxy.addons import AddonManager
 from hippolyzer.lib.proxy.addon_utils import BaseAddon, SessionProperty
 from hippolyzer.lib.proxy.commands import handle_command
@@ -25,7 +26,6 @@ from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session
 from hippolyzer.lib.proxy.task_scheduler import TaskLifeScope
-from hippolyzer.lib.proxy.templates import PCode
 
 
 def _is_color_blueish(color: bytes) -> bool:
diff --git a/addon_examples/hide_lookat.py b/addon_examples/hide_lookat.py
index 0b02219..7b8a2eb 100644
--- a/addon_examples/hide_lookat.py
+++ b/addon_examples/hide_lookat.py
@@ -2,11 +2,11 @@
 Drop outgoing packets that might leak what you're looking at, similar to Firestorm
 """
 
+from hippolyzer.lib.base.templates import ViewerEffectType
 from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.packets import Direction
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session
-from hippolyzer.lib.proxy.templates import ViewerEffectType
 
 
 BLOCKED_EFFECTS = (
diff --git a/addon_examples/local_mesh.py b/addon_examples/local_mesh.py
index ad12f50..0cadc3a 100644
--- a/addon_examples/local_mesh.py
+++ b/addon_examples/local_mesh.py
@@ -30,6 +30,7 @@ from hippolyzer.lib.base.datatypes import *
 from hippolyzer.lib.base.mesh import LLMeshSerializer, MeshAsset
 from hippolyzer.lib.base import serialization as se
 from hippolyzer.lib.base.objects import Object
+from hippolyzer.lib.base.templates import ExtraParamType
 from hippolyzer.lib.proxy import addon_ctx
 from hippolyzer.lib.proxy.addon_utils import show_message, BaseAddon, GlobalProperty, SessionProperty
 from hippolyzer.lib.proxy.commands import handle_command
@@ -38,7 +39,6 @@ from hippolyzer.lib.proxy.http_flow import HippoHTTPFlow
 from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session, SessionManager
-from hippolyzer.lib.proxy.templates import ExtraParamType
 
 
 def _modify_crc(crc_tweak, crc_val):
diff --git a/addon_examples/monochrome.py b/addon_examples/monochrome.py
index 55a817b..ddfaa3f 100644
--- a/addon_examples/monochrome.py
+++ b/addon_examples/monochrome.py
@@ -27,12 +27,12 @@ from mitmproxy.http import HTTPFlow
 from hippolyzer.lib.base.datatypes import UUID
 from hippolyzer.lib.base.jp2_utils import BufferedJp2k
 from hippolyzer.lib.base.multiprocessing_utils import ParentProcessWatcher
+from hippolyzer.lib.base.templates import TextureEntry
 from hippolyzer.lib.proxy.addon_utils import AssetAliasTracker, BaseAddon, GlobalProperty, AddonProcess
 from hippolyzer.lib.proxy.http_flow import HippoHTTPFlow
 from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session, SessionManager
-from hippolyzer.lib.proxy.templates import TextureEntry
 
 
 glymur.set_option('lib.num_threads', 4)
diff --git a/addon_examples/objectupdate_blame.py b/addon_examples/objectupdate_blame.py
index 1098931..996ee0f 100644
--- a/addon_examples/objectupdate_blame.py
+++ b/addon_examples/objectupdate_blame.py
@@ -11,11 +11,11 @@ from typing import *
 
 from hippolyzer.lib.base.datatypes import UUID
 from hippolyzer.lib.base.objects import Object
+from hippolyzer.lib.base.templates import PCode
 from hippolyzer.lib.proxy.addon_utils import BaseAddon, show_message, SessionProperty
 from hippolyzer.lib.proxy.commands import handle_command
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session
-from hippolyzer.lib.proxy.templates import PCode
 
 
 class ObjectUpdateBlameAddon(BaseAddon):
diff --git a/addon_examples/payday.py b/addon_examples/payday.py
index 2a95b1c..0fade1c 100644
--- a/addon_examples/payday.py
+++ b/addon_examples/payday.py
@@ -4,11 +4,11 @@ Do the money dance whenever someone in the sim pays you directly
 
 from hippolyzer.lib.base.datatypes import UUID
 from hippolyzer.lib.base.message.message import Block
+from hippolyzer.lib.base.templates import MoneyTransactionType, PCode, ChatType
 from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.addon_utils import send_chat, BaseAddon
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session
-from hippolyzer.lib.proxy.templates import MoneyTransactionType, PCode, ChatType
 
 
 class PaydayAddon(BaseAddon):
diff --git a/addon_examples/recapitator.py b/addon_examples/recapitator.py
index 809d87d..9dc54e6 100644
--- a/addon_examples/recapitator.py
+++ b/addon_examples/recapitator.py
@@ -19,6 +19,7 @@ from typing import *
 from hippolyzer.lib.base import llsd
 from hippolyzer.lib.base.datatypes import UUID
 from hippolyzer.lib.base.message.message import Block
+from hippolyzer.lib.base.templates import AssetType, WearableType
 from hippolyzer.lib.base.wearables import Wearable, VISUAL_PARAMS
 from hippolyzer.lib.proxy.addon_utils import BaseAddon, SessionProperty, AssetAliasTracker, show_message
 from hippolyzer.lib.proxy.commands import handle_command
@@ -27,7 +28,6 @@ from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.packets import Direction
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session, SessionManager
-from hippolyzer.lib.proxy.templates import AssetType, WearableType
 
 
 # Get all VisualParam IDs that belong to head sliders
diff --git a/addon_examples/shield.py b/addon_examples/shield.py
index 26cd383..f9c7d1f 100644
--- a/addon_examples/shield.py
+++ b/addon_examples/shield.py
@@ -1,10 +1,10 @@
 """Block potentially bad things"""
+from hippolyzer.lib.base.templates import IMDialogType, XferFilePath
 from hippolyzer.lib.proxy.addon_utils import BaseAddon, show_message
 from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.packets import Direction
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session
-from hippolyzer.lib.proxy.templates import IMDialogType, XferFilePath
 
 SUSPICIOUS_PACKETS = {"TransferRequest", "UUIDNameRequest", "UUIDGroupNameRequest", "OpenCircuit"}
 REGULAR_IM_DIALOGS = (IMDialogType.TYPING_STOP, IMDialogType.TYPING_STOP, IMDialogType.NOTHING_SPECIAL)
diff --git a/addon_examples/transfer_example.py b/addon_examples/transfer_example.py
index 58123cf..b450f4f 100644
--- a/addon_examples/transfer_example.py
+++ b/addon_examples/transfer_example.py
@@ -5,12 +5,7 @@ from typing import *
 
 from hippolyzer.lib.base.legacy_inv import InventoryModel, InventoryItem
 from hippolyzer.lib.base.message.message import Block
-from hippolyzer.lib.proxy.addon_utils import BaseAddon, show_message
-from hippolyzer.lib.proxy.commands import handle_command
-from hippolyzer.lib.proxy.message import ProxiedMessage
-from hippolyzer.lib.proxy.region import ProxiedRegion
-from hippolyzer.lib.proxy.sessions import Session
-from hippolyzer.lib.proxy.templates import (
+from hippolyzer.lib.base.templates import (
     AssetType,
     EstateAssetType,
     TransferRequestParamsSimEstate,
@@ -18,6 +13,11 @@ from hippolyzer.lib.proxy.templates import (
     TransferSourceType,
     XferFilePath,
 )
+from hippolyzer.lib.proxy.addon_utils import BaseAddon, show_message
+from hippolyzer.lib.proxy.commands import handle_command
+from hippolyzer.lib.proxy.message import ProxiedMessage
+from hippolyzer.lib.proxy.region import ProxiedRegion
+from hippolyzer.lib.proxy.sessions import Session
 
 
 class TransferExampleAddon(BaseAddon):
diff --git a/addon_examples/uploader.py b/addon_examples/uploader.py
index 625f425..9085d35 100644
--- a/addon_examples/uploader.py
+++ b/addon_examples/uploader.py
@@ -12,6 +12,7 @@ import aiohttp
 
 from hippolyzer.lib.base.datatypes import UUID
 from hippolyzer.lib.base.message.message import Block
+from hippolyzer.lib.base.templates import AssetType
 from hippolyzer.lib.proxy.addons import AddonManager
 from hippolyzer.lib.proxy.addon_utils import ais_item_to_inventory_data, show_message, BaseAddon
 from hippolyzer.lib.proxy.commands import handle_command, Parameter
@@ -19,7 +20,6 @@ from hippolyzer.lib.proxy.packets import Direction
 from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session
-from hippolyzer.lib.proxy.templates import AssetType
 
 
 class UploaderAddon(BaseAddon):
diff --git a/addon_examples/xfer_example.py b/addon_examples/xfer_example.py
index 9c693ea..0ee7f5f 100644
--- a/addon_examples/xfer_example.py
+++ b/addon_examples/xfer_example.py
@@ -3,13 +3,13 @@ Example of how to request an Xfer
 """
 from hippolyzer.lib.base.datatypes import UUID
 from hippolyzer.lib.base.legacy_inv import InventoryModel
+from hippolyzer.lib.base.templates import XferFilePath, AssetType, InventoryType, WearableType
 from hippolyzer.lib.base.message.message import Block
 from hippolyzer.lib.proxy.addon_utils import BaseAddon, show_message
 from hippolyzer.lib.proxy.commands import handle_command
 from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import Session
-from hippolyzer.lib.proxy.templates import XferFilePath, AssetType, InventoryType, WearableType
 
 
 class XferExampleAddon(BaseAddon):
diff --git a/hippolyzer/lib/proxy/addon_utils.py b/hippolyzer/lib/proxy/addon_utils.py
index e70bacc..fcd2008 100644
--- a/hippolyzer/lib/proxy/addon_utils.py
+++ b/hippolyzer/lib/proxy/addon_utils.py
@@ -18,7 +18,7 @@ from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.region import ProxiedRegion
 from hippolyzer.lib.proxy.sessions import SessionManager, Session
 from hippolyzer.lib.proxy.task_scheduler import TaskLifeScope
-from hippolyzer.lib.proxy.templates import ChatSourceType, ChatType
+from hippolyzer.lib.base.templates import ChatSourceType, ChatType
 
 
 class AssetAliasTracker:
diff --git a/hippolyzer/lib/proxy/message.py b/hippolyzer/lib/proxy/message.py
index a6dc4a6..02e143a 100644
--- a/hippolyzer/lib/proxy/message.py
+++ b/hippolyzer/lib/proxy/message.py
@@ -14,7 +14,7 @@ import hippolyzer.lib.base.serialization as se
 from hippolyzer.lib.base import llsd
 from hippolyzer.lib.base.helpers import HippoPrettyPrinter
 from hippolyzer.lib.base.message.message import Message, Block, PacketFlags
-import hippolyzer.lib.proxy.templates as templates
+import hippolyzer.lib.base.templates as templates
 from hippolyzer.lib.base.message.msgtypes import MsgBlockType
 from hippolyzer.lib.base.message.template import MessageTemplate
 from hippolyzer.lib.proxy.packets import Direction
diff --git a/hippolyzer/lib/proxy/objects.py b/hippolyzer/lib/proxy/objects.py
index 5a4fb74..3f056cd 100644
--- a/hippolyzer/lib/proxy/objects.py
+++ b/hippolyzer/lib/proxy/objects.py
@@ -26,7 +26,7 @@ from hippolyzer.lib.proxy.addons import AddonManager
 from hippolyzer.lib.proxy.http_flow import HippoHTTPFlow
 from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.namecache import NameCache, NameCacheEntry
-from hippolyzer.lib.proxy.templates import PCode, ObjectStateSerializer
+from hippolyzer.lib.base.templates import PCode, ObjectStateSerializer
 from hippolyzer.lib.proxy.vocache import RegionViewerObjectCacheChain
 
 if TYPE_CHECKING:
diff --git a/hippolyzer/lib/proxy/transfer_manager.py b/hippolyzer/lib/proxy/transfer_manager.py
index 33d6705..8220724 100644
--- a/hippolyzer/lib/proxy/transfer_manager.py
+++ b/hippolyzer/lib/proxy/transfer_manager.py
@@ -11,7 +11,7 @@ from hippolyzer.lib.base.datatypes import UUID
 from hippolyzer.lib.base.helpers import proxify
 from hippolyzer.lib.base.message.message import Block
 from hippolyzer.lib.proxy.message import ProxiedMessage
-from hippolyzer.lib.proxy.templates import (
+from hippolyzer.lib.base.templates import (
     TransferRequestParamsBase,
     TransferChannelType,
     TransferSourceType,
diff --git a/hippolyzer/lib/proxy/xfer_manager.py b/hippolyzer/lib/proxy/xfer_manager.py
index 3532d62..6e90a38 100644
--- a/hippolyzer/lib/proxy/xfer_manager.py
+++ b/hippolyzer/lib/proxy/xfer_manager.py
@@ -15,7 +15,7 @@ from hippolyzer.lib.base.message.message import Block
 from hippolyzer.lib.base.message.msgtypes import MsgType
 from hippolyzer.lib.proxy.message import ProxiedMessage
 from hippolyzer.lib.proxy.packets import Direction
-from hippolyzer.lib.proxy.templates import XferPacket, XferFilePath, AssetType, XferError
+from hippolyzer.lib.base.templates import XferPacket, XferFilePath, AssetType, XferError
 
 if TYPE_CHECKING:
     from hippolyzer.lib.proxy.region import ProxiedRegion
diff --git a/tests/proxy/test_object_manager.py b/tests/proxy/test_object_manager.py
index f9f8ccd..97c970b 100644
--- a/tests/proxy/test_object_manager.py
+++ b/tests/proxy/test_object_manager.py
@@ -15,7 +15,7 @@ from hippolyzer.lib.proxy.addons import AddonManager
 from hippolyzer.lib.proxy.addon_utils import BaseAddon
 from hippolyzer.lib.proxy.message import ProxiedMessage as Message
 from hippolyzer.lib.proxy.region import ProxiedRegion
-from hippolyzer.lib.proxy.templates import PCode
+from hippolyzer.lib.base.templates import PCode
 from hippolyzer.lib.proxy.vocache import RegionViewerObjectCacheChain, RegionViewerObjectCache, ViewerObjectCacheEntry
 
 from . import BaseProxyTest
diff --git a/tests/proxy/test_templates.py b/tests/proxy/test_templates.py
index aaaafe4..63d7413 100644
--- a/tests/proxy/test_templates.py
+++ b/tests/proxy/test_templates.py
@@ -3,7 +3,7 @@ import unittest
 import hippolyzer.lib.base.serialization as se
 from hippolyzer.lib.base.datatypes import UUID
 from hippolyzer.lib.proxy.message import ProxiedMessage
-from hippolyzer.lib.proxy.templates import TextureEntrySubfieldSerializer, TEFaceBitfield
+from hippolyzer.lib.base.templates import TextureEntrySubfieldSerializer, TEFaceBitfield
 
 EXAMPLE_TE = b"\x89UgG$\xcbC\xed\x92\x0bG\xca\xed\x15F_\x08\xe7\xb2\x98\x04\xca\x10;\x85\x94\x05Lj\x8d\xd4" \
              b"\x0b\x1f\x01B\xcb\xe6|\x1d,\xa7sc\xa6\x1a\xa2L\xb1u\x01\x00\x00\x00\x00\x00\x00\x00\x00\x80?" \