diff --git a/pymetaverse/agent.py b/pymetaverse/viewer/agent.py
similarity index 100%
rename from pymetaverse/agent.py
rename to pymetaverse/viewer/agent.py
diff --git a/pymetaverse/circuit.py b/pymetaverse/viewer/circuit.py
similarity index 100%
rename from pymetaverse/circuit.py
rename to pymetaverse/viewer/circuit.py
diff --git a/pymetaverse/message_template.msg b/pymetaverse/viewer/message_template.msg
similarity index 100%
rename from pymetaverse/message_template.msg
rename to pymetaverse/viewer/message_template.msg
diff --git a/pymetaverse/message_template.msg.sha1 b/pymetaverse/viewer/message_template.msg.sha1
similarity index 100%
rename from pymetaverse/message_template.msg.sha1
rename to pymetaverse/viewer/message_template.msg.sha1
diff --git a/pymetaverse/messages.py b/pymetaverse/viewer/messages.py
similarity index 100%
rename from pymetaverse/messages.py
rename to pymetaverse/viewer/messages.py
diff --git a/pymetaverse/packet.py b/pymetaverse/viewer/packet.py
similarity index 100%
rename from pymetaverse/packet.py
rename to pymetaverse/viewer/packet.py
diff --git a/pymetaverse/region.py b/pymetaverse/viewer/region.py
similarity index 100%
rename from pymetaverse/region.py
rename to pymetaverse/viewer/region.py
diff --git a/pymetaverse/simulator.py b/pymetaverse/viewer/simulator.py
similarity index 100%
rename from pymetaverse/simulator.py
rename to pymetaverse/viewer/simulator.py