From 6a6dd5fdb1bb22deff46e4d62ed13ecfe0b942ae Mon Sep 17 00:00:00 2001
From: "tao.takashi" <devnull@localhost>
Date: Wed, 3 Sep 2008 22:55:07 +0000
Subject: [PATCH] The big message system renaming:

- renamed all files starting with message_ to a name without message_
- exception: msgdict as dict is a reserved word
- moved all tests into the message/ directory
- changed all tests to use the new names
- changed all modules to use the new names
- shortened imports to not use the full path (pyogp.lib.base. but only the short path)
- removed makepacketdict.py as it's not needed anymore
- moved the data/ directory into message/ as it's local to the msg system

and some small cleanups on the way.

please run the tests!

I haven't adjusted pyogp.interop yet, Enus wanted to look after it.
---
 pyogp/lib/base/makepacketdict.py              | 59 -------------------
 pyogp/lib/base/message/circuit.py             |  4 +-
 pyogp/lib/base/{ => message}/data/__init__.py |  0
 pyogp/lib/base/{ => message}/data/message.xml |  0
 .../{ => message}/data/message_template.msg   |  0
 pyogp/lib/base/message/data_packer.py         |  2 +-
 pyogp/lib/base/message/data_unpacker.py       |  2 +-
 .../{message_factory.py => factory.py}        |  1 +
 ...essage_llsd_builder.py => llsd_builder.py} |  5 +-
 pyogp/lib/base/message/message.py             |  3 +-
 .../message/{message_dict.py => msgdict.py}   |  0
 pyogp/lib/base/message/packet.py              |  4 +-
 .../{message_template.py => template.py}      |  2 +-
 ...sage_template_dict.py => template_dict.py} |  9 ++-
 ..._template_parser.py => template_parser.py} | 15 +++--
 pyogp/lib/base/message/tests/__init__.py      |  0
 .../base/{ => message}/tests/packet_test.py   |  2 +-
 .../base/{ => message}/tests/test_circuits.py |  0
 .../{ => message}/tests/test_llsd_builder.py  |  4 +-
 .../tests/test_message_wrapper.py             |  4 +-
 .../{ => message}/tests/test_packetdata.py    |  6 +-
 .../tests/test_template_parser.py             | 11 ++--
 .../tests/test_udp_deserializer.py            |  2 +-
 .../tests/test_udp_serializer.py              |  2 +-
 .../{ => message}/tests/test_udpconnection.py |  2 +-
 .../message/{message_types.py => types.py}    |  0
 pyogp/lib/base/message/udpdeserializer.py     | 11 ++--
 pyogp/lib/base/message/udpdispatcher.py       | 15 +++--
 pyogp/lib/base/message/udpserializer.py       | 13 ++--
 29 files changed, 54 insertions(+), 124 deletions(-)
 delete mode 100644 pyogp/lib/base/makepacketdict.py
 rename pyogp/lib/base/{ => message}/data/__init__.py (100%)
 rename pyogp/lib/base/{ => message}/data/message.xml (100%)
 rename pyogp/lib/base/{ => message}/data/message_template.msg (100%)
 rename pyogp/lib/base/message/{message_factory.py => factory.py} (99%)
 rename pyogp/lib/base/message/{message_llsd_builder.py => llsd_builder.py} (93%)
 rename pyogp/lib/base/message/{message_dict.py => msgdict.py} (100%)
 rename pyogp/lib/base/message/{message_template.py => template.py} (98%)
 rename pyogp/lib/base/message/{message_template_dict.py => template_dict.py} (93%)
 rename pyogp/lib/base/message/{message_template_parser.py => template_parser.py} (94%)
 create mode 100644 pyogp/lib/base/message/tests/__init__.py
 rename pyogp/lib/base/{ => message}/tests/packet_test.py (99%)
 rename pyogp/lib/base/{ => message}/tests/test_circuits.py (100%)
 rename pyogp/lib/base/{ => message}/tests/test_llsd_builder.py (93%)
 rename pyogp/lib/base/{ => message}/tests/test_message_wrapper.py (96%)
 rename pyogp/lib/base/{ => message}/tests/test_packetdata.py (92%)
 rename pyogp/lib/base/{ => message}/tests/test_template_parser.py (92%)
 rename pyogp/lib/base/{ => message}/tests/test_udp_deserializer.py (96%)
 rename pyogp/lib/base/{ => message}/tests/test_udp_serializer.py (95%)
 rename pyogp/lib/base/{ => message}/tests/test_udpconnection.py (99%)
 rename pyogp/lib/base/message/{message_types.py => types.py} (100%)

diff --git a/pyogp/lib/base/makepacketdict.py b/pyogp/lib/base/makepacketdict.py
deleted file mode 100644
index ed31edd..0000000
--- a/pyogp/lib/base/makepacketdict.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/python
-"""
-@file makepacketdict.py
-@author Lawson English
-@date 2008-06-13
-@brief Iniitializes path directories
-
-$LicenseInfo:firstyear=2008&license=apachev2$
-
-Copyright 2008, Linden Research, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-$/LicenseInfo$
-"""
-
-import re
-from pyogp.lib.base.data import msg_tmpl
-
-def makereversepacketdict():
-    rev_dict = {}
-    msg_tmpl.seek(0)
-    for line in msg_tmpl:
-        results = re.match("^\t([^\t{}]+.+)",line)
-        if results:
-            aline = results.group(1)
-            aline = aline.split()
-            if aline[1] == "Fixed": 
-                rev_dict[aline[0]] = (aline[1],int("0x"+aline[2][8:],16))
-                
-            else:
-                rev_dict[aline[0]] = (aline[1],int(aline[2]))
-
-    return rev_dict
-
-def makepacketdict():
-    dict = {}
-    msg_tmpl.seek(0)
-    for line in msg_tmpl:
-        results = re.match("^\t([^\t{}]+.+)",line)
-        if results:
-            aline = results.group(1)
-            aline = aline.split()
-            if aline[1] == "Fixed": 
-                dict[(aline[1],int("0x"+aline[2][8:],16))] = (aline[0],aline[3], aline[4])
-                
-            else:
-                dict[(aline[1],int(aline[2]))] = (aline[0],aline[3], aline[4])
-
-    return dict
diff --git a/pyogp/lib/base/message/circuit.py b/pyogp/lib/base/message/circuit.py
index f87cf85..9783be4 100644
--- a/pyogp/lib/base/message/circuit.py
+++ b/pyogp/lib/base/message/circuit.py
@@ -1,8 +1,8 @@
 import grokcore.component as grok
 from zope.interface import implements
 
-from pyogp.lib.base.message.interfaces import IHost
-from pyogp.lib.base.message.message_types import PackFlags
+from interfaces import IHost
+from types import PackFlags
 
 class Host(grok.Adapter):
     grok.implements(IHost)
diff --git a/pyogp/lib/base/data/__init__.py b/pyogp/lib/base/message/data/__init__.py
similarity index 100%
rename from pyogp/lib/base/data/__init__.py
rename to pyogp/lib/base/message/data/__init__.py
diff --git a/pyogp/lib/base/data/message.xml b/pyogp/lib/base/message/data/message.xml
similarity index 100%
rename from pyogp/lib/base/data/message.xml
rename to pyogp/lib/base/message/data/message.xml
diff --git a/pyogp/lib/base/data/message_template.msg b/pyogp/lib/base/message/data/message_template.msg
similarity index 100%
rename from pyogp/lib/base/data/message_template.msg
rename to pyogp/lib/base/message/data/message_template.msg
diff --git a/pyogp/lib/base/message/data_packer.py b/pyogp/lib/base/message/data_packer.py
index 6d16ec2..27b988f 100644
--- a/pyogp/lib/base/message/data_packer.py
+++ b/pyogp/lib/base/message/data_packer.py
@@ -1,6 +1,6 @@
 import struct
 
-from pyogp.lib.base.message.message_types import MsgType, EndianType
+from types import MsgType, EndianType
 
 class DataPacker(object):
     def __init__(self):
diff --git a/pyogp/lib/base/message/data_unpacker.py b/pyogp/lib/base/message/data_unpacker.py
index cd5a5d6..272ccb9 100644
--- a/pyogp/lib/base/message/data_unpacker.py
+++ b/pyogp/lib/base/message/data_unpacker.py
@@ -1,7 +1,7 @@
 import struct
 from uuid import UUID
 
-from pyogp.lib.base.message.message_types import MsgType, EndianType, sizeof
+from types import MsgType, EndianType, sizeof
 
 class DataUnpacker(object):
     def __init__(self):
diff --git a/pyogp/lib/base/message/message_factory.py b/pyogp/lib/base/message/factory.py
similarity index 99%
rename from pyogp/lib/base/message/message_factory.py
rename to pyogp/lib/base/message/factory.py
index 501052a..c4d1ef1 100644
--- a/pyogp/lib/base/message/message_factory.py
+++ b/pyogp/lib/base/message/factory.py
@@ -1,3 +1,4 @@
+
 class MessageFactory(object):
     #not here, this goes somewhere else
     def new_message(self, message_name):
diff --git a/pyogp/lib/base/message/message_llsd_builder.py b/pyogp/lib/base/message/llsd_builder.py
similarity index 93%
rename from pyogp/lib/base/message/message_llsd_builder.py
rename to pyogp/lib/base/message/llsd_builder.py
index eaee511..56450b4 100644
--- a/pyogp/lib/base/message/message_llsd_builder.py
+++ b/pyogp/lib/base/message/llsd_builder.py
@@ -2,9 +2,8 @@
 from zope.interface import implements
 
 #local
-from pyogp.lib.base.message.interfaces import IMessageBuilder
-from pyogp.lib.base.message.message_template import MsgData, MsgBlockData, \
-     MsgVariableData
+from interfaces import IMessageBuilder
+from template import MsgData, MsgBlockData, MsgVariableData
 
 class LLSDMessageBuilder(object):
     implements(IMessageBuilder)
diff --git a/pyogp/lib/base/message/message.py b/pyogp/lib/base/message/message.py
index 0aa6a08..8943106 100644
--- a/pyogp/lib/base/message/message.py
+++ b/pyogp/lib/base/message/message.py
@@ -1,5 +1,4 @@
-from pyogp.lib.base.message.message_template import MsgData, MsgBlockData, \
-     MsgVariableData
+from template import MsgData, MsgBlockData, MsgVariableData
 
 #NOTE: right now there is no checking with the template
 class Message(MsgData):
diff --git a/pyogp/lib/base/message/message_dict.py b/pyogp/lib/base/message/msgdict.py
similarity index 100%
rename from pyogp/lib/base/message/message_dict.py
rename to pyogp/lib/base/message/msgdict.py
diff --git a/pyogp/lib/base/message/packet.py b/pyogp/lib/base/message/packet.py
index 2d66bf0..f2b7ddd 100644
--- a/pyogp/lib/base/message/packet.py
+++ b/pyogp/lib/base/message/packet.py
@@ -1,7 +1,7 @@
 import grokcore.component as grok
 
-from pyogp.lib.base.message.message_types import PackFlags
-from pyogp.lib.base.message.interfaces import IUDPPacket, IMessageData
+from types import PackFlags
+from interfaces import IUDPPacket, IMessageData
 
 class UDPPacket(grok.Adapter):
     grok.implements(IUDPPacket)
diff --git a/pyogp/lib/base/message/message_template.py b/pyogp/lib/base/message/template.py
similarity index 98%
rename from pyogp/lib/base/message/message_template.py
rename to pyogp/lib/base/message/template.py
index 6d84154..11344a6 100644
--- a/pyogp/lib/base/message/message_template.py
+++ b/pyogp/lib/base/message/template.py
@@ -31,7 +31,7 @@ import pprint
 from zope.interface import implements
 import grokcore.component as grok
 
-from pyogp.lib.base.message.interfaces import IMessageData
+from interfaces import IMessageData
 
 #this probably needs to implement an interface so it can be serialized
 class MsgData(object):
diff --git a/pyogp/lib/base/message/message_template_dict.py b/pyogp/lib/base/message/template_dict.py
similarity index 93%
rename from pyogp/lib/base/message/message_template_dict.py
rename to pyogp/lib/base/message/template_dict.py
index 1a5269b..4b01bbc 100644
--- a/pyogp/lib/base/message/message_template_dict.py
+++ b/pyogp/lib/base/message/template_dict.py
@@ -1,13 +1,12 @@
-from pyogp.lib.base.data import msg_tmpl
-from pyogp.lib.base.message.message_types import MsgFrequency
+from types import MsgFrequency
 from interfaces import ITemplateDictionary
 import grokcore.component as grok
 from grokcore.component import GlobalUtility
 
-from pyogp.lib.base.data import msg_tmpl, msg_details
-from message_template_parser import MessageTemplateParser
+from data import msg_tmpl, msg_details
+from template_parser import MessageTemplateParser
 from data_packer import DataPacker
-from message_types import MsgType, EndianType
+from types import MsgType, EndianType
 
 
 class TemplateDictionary(GlobalUtility):
diff --git a/pyogp/lib/base/message/message_template_parser.py b/pyogp/lib/base/message/template_parser.py
similarity index 94%
rename from pyogp/lib/base/message/message_template_parser.py
rename to pyogp/lib/base/message/template_parser.py
index 55dbf93..b453a8f 100644
--- a/pyogp/lib/base/message/message_template_parser.py
+++ b/pyogp/lib/base/message/template_parser.py
@@ -5,10 +5,10 @@ import re
 import pprint
 
 #local libraries
-import message_template
-from pyogp.lib.base.data import msg_tmpl
-from pyogp.lib.base.message.message_types import MsgFrequency, MsgTrust, \
-     MsgEncoding, MsgDeprecation, MsgBlockType, MsgType, sizeof
+import template
+from data import msg_tmpl
+from types import MsgFrequency, MsgTrust, MsgEncoding
+from types import MsgDeprecation, MsgBlockType, MsgType, sizeof
 
 class MessageTemplateParser(object):
     def __init__(self, template_file):
@@ -23,7 +23,6 @@ class MessageTemplateParser(object):
 
     def __add_template(self, new_template):
         self.count += 1
-        #self.message_templates[new_template.get_name()] = new_template
         self.message_templates.append(new_template)
 
     def __parse_template_file(self):
@@ -60,7 +59,7 @@ class MessageTemplateParser(object):
                 parts = packet_header.group(1)
                 parts = parts.split()
                 
-                current_template = message_template.MessageTemplate(parts[0])
+                current_template = template.MessageTemplate(parts[0])
                 frequency = None
                 if parts[1] == 'Low':
                     frequency = MsgFrequency.LOW_FREQUENCY_MESSAGE
@@ -125,7 +124,7 @@ class MessageTemplateParser(object):
                 parts = block_header.group(1)
                 parts = parts.split()
 
-                current_block = message_template.MessageTemplateBlock(parts[0])
+                current_block = template.MessageTemplateBlock(parts[0])
 
                 block_type = None
                 block_num = 0
@@ -201,7 +200,7 @@ class MessageTemplateParser(object):
                 if var_size == -1:
                     var_size = sizeof(var_type)
                 
-                current_var = message_template.MessageTemplateVariable(parts[0], var_type, var_size)
+                current_var = template.MessageTemplateVariable(parts[0], var_type, var_size)
                 current_block.add_variable(current_var)
 
         self.template_file.seek(0)
diff --git a/pyogp/lib/base/message/tests/__init__.py b/pyogp/lib/base/message/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pyogp/lib/base/tests/packet_test.py b/pyogp/lib/base/message/tests/packet_test.py
similarity index 99%
rename from pyogp/lib/base/tests/packet_test.py
rename to pyogp/lib/base/message/tests/packet_test.py
index d7b5d5a..568678a 100644
--- a/pyogp/lib/base/tests/packet_test.py
+++ b/pyogp/lib/base/message/tests/packet_test.py
@@ -1,7 +1,7 @@
 import unittest
-import message_template
 
 class PacketTest(unittest.TestCase):
+    pass
 """
     #testing each component
     def test_freqLow(self):
diff --git a/pyogp/lib/base/tests/test_circuits.py b/pyogp/lib/base/message/tests/test_circuits.py
similarity index 100%
rename from pyogp/lib/base/tests/test_circuits.py
rename to pyogp/lib/base/message/tests/test_circuits.py
diff --git a/pyogp/lib/base/tests/test_llsd_builder.py b/pyogp/lib/base/message/tests/test_llsd_builder.py
similarity index 93%
rename from pyogp/lib/base/tests/test_llsd_builder.py
rename to pyogp/lib/base/message/tests/test_llsd_builder.py
index a7fcf5c..aaca2b5 100644
--- a/pyogp/lib/base/tests/test_llsd_builder.py
+++ b/pyogp/lib/base/message/tests/test_llsd_builder.py
@@ -5,8 +5,8 @@ import unittest, doctest
 from indra.base import llsd
 
 #local libraries
-from pyogp.lib.base.message.message_llsd_builder import LLSDMessageBuilder
-from pyogp.lib.base.message.message_types import MsgType
+from pyogp.lib.base.message.llsd_builder import LLSDMessageBuilder
+from pyogp.lib.base.message.types import MsgType
 
 class TestLLSDBuilder(unittest.TestCase):
     
diff --git a/pyogp/lib/base/tests/test_message_wrapper.py b/pyogp/lib/base/message/tests/test_message_wrapper.py
similarity index 96%
rename from pyogp/lib/base/tests/test_message_wrapper.py
rename to pyogp/lib/base/message/tests/test_message_wrapper.py
index 4e99a51..49d6c07 100644
--- a/pyogp/lib/base/tests/test_message_wrapper.py
+++ b/pyogp/lib/base/message/tests/test_message_wrapper.py
@@ -3,8 +3,8 @@ import unittest, doctest
 from uuid import UUID
 
 #local libraries
-from pyogp.lib.base.data import msg_tmpl
-from pyogp.lib.base.message.message_types import MsgType
+from pyogp.lib.base.message.data import msg_tmpl
+from pyogp.lib.base.message.types import MsgType
 from pyogp.lib.base.message.message import Message, Block
 from pyogp.lib.base.interfaces import IDeserialization
 from pyogp.lib.base.registration import init
diff --git a/pyogp/lib/base/tests/test_packetdata.py b/pyogp/lib/base/message/tests/test_packetdata.py
similarity index 92%
rename from pyogp/lib/base/tests/test_packetdata.py
rename to pyogp/lib/base/message/tests/test_packetdata.py
index 324a5b6..0601ca5 100644
--- a/pyogp/lib/base/tests/test_packetdata.py
+++ b/pyogp/lib/base/message/tests/test_packetdata.py
@@ -6,11 +6,11 @@ import binascii
 from zope.component import getUtility
 
 #local libraries
-from pyogp.lib.base.data import msg_tmpl
+from pyogp.lib.base.message.data import msg_tmpl
 from pyogp.lib.base.message.interfaces import IUDPDispatcher
 from pyogp.lib.base.interfaces import IDeserialization
-from pyogp.lib.base.message.message_template_parser import MessageTemplateParser
-from pyogp.lib.base.message.message_template_dict import TemplateDictionary
+from pyogp.lib.base.message.template_parser import MessageTemplateParser
+from pyogp.lib.base.message.template_dict import TemplateDictionary
 from pyogp.lib.base.registration import init
 
 AGENT_DATA_UPDATE="C0 00 00 00 02 00 FF FF 01 83 1C 8A 77 67 E3 7B 42 2E AF B3 85 09 31 97 CA D1 03 4A 42 00 01 06 4B 72 61 66 74 00 01 01 00 1A"
diff --git a/pyogp/lib/base/tests/test_template_parser.py b/pyogp/lib/base/message/tests/test_template_parser.py
similarity index 92%
rename from pyogp/lib/base/tests/test_template_parser.py
rename to pyogp/lib/base/message/tests/test_template_parser.py
index 15b7dca..ff6c9b5 100644
--- a/pyogp/lib/base/tests/test_template_parser.py
+++ b/pyogp/lib/base/message/tests/test_template_parser.py
@@ -2,12 +2,11 @@
 import unittest, doctest
 
 #local libraries
-from pyogp.lib.base.data import msg_tmpl
-from pyogp.lib.base.message.message_template import MessageTemplate, MessageTemplateBlock, MessageTemplateVariable
-from pyogp.lib.base.message.message_template_dict import TemplateDictionary
-from pyogp.lib.base.message.message_template_parser import MessageTemplateParser
-from pyogp.lib.base.message.message_types import MsgFrequency, MsgTrust, \
-     MsgEncoding, MsgDeprecation, MsgBlockType, MsgType
+from pyogp.lib.base.message.data import msg_tmpl
+from pyogp.lib.base.message.template import MessageTemplate, MessageTemplateBlock, MessageTemplateVariable
+from pyogp.lib.base.message.template_dict import TemplateDictionary
+from pyogp.lib.base.message.template_parser import MessageTemplateParser
+from pyogp.lib.base.message.types import MsgFrequency, MsgTrust, MsgEncoding, MsgDeprecation, MsgBlockType, MsgType
 
 class TestDictionary(unittest.TestCase):
     def setUp(self):
diff --git a/pyogp/lib/base/tests/test_udp_deserializer.py b/pyogp/lib/base/message/tests/test_udp_deserializer.py
similarity index 96%
rename from pyogp/lib/base/tests/test_udp_deserializer.py
rename to pyogp/lib/base/message/tests/test_udp_deserializer.py
index 593a61c..6a95b7a 100644
--- a/pyogp/lib/base/tests/test_udp_deserializer.py
+++ b/pyogp/lib/base/message/tests/test_udp_deserializer.py
@@ -3,7 +3,7 @@ import unittest, doctest
 from uuid import UUID
 
 #local libraries
-from pyogp.lib.base.message.message_types import MsgType
+from pyogp.lib.base.message.types import MsgType
 from pyogp.lib.base.message.message import Message, Block
 from pyogp.lib.base.message.interfaces import IPacket
 from pyogp.lib.base.interfaces import IDeserialization, ISerialization
diff --git a/pyogp/lib/base/tests/test_udp_serializer.py b/pyogp/lib/base/message/tests/test_udp_serializer.py
similarity index 95%
rename from pyogp/lib/base/tests/test_udp_serializer.py
rename to pyogp/lib/base/message/tests/test_udp_serializer.py
index 88dce00..3235647 100644
--- a/pyogp/lib/base/tests/test_udp_serializer.py
+++ b/pyogp/lib/base/message/tests/test_udp_serializer.py
@@ -3,7 +3,7 @@ import unittest, doctest
 from uuid import UUID
 
 #local libraries
-from pyogp.lib.base.message.message_types import MsgType
+from pyogp.lib.base.message.types import MsgType
 from pyogp.lib.base.message.interfaces import IPacket
 from pyogp.lib.base.interfaces import ISerialization, IDeserialization
 from pyogp.lib.base.registration import init
diff --git a/pyogp/lib/base/tests/test_udpconnection.py b/pyogp/lib/base/message/tests/test_udpconnection.py
similarity index 99%
rename from pyogp/lib/base/tests/test_udpconnection.py
rename to pyogp/lib/base/message/tests/test_udpconnection.py
index 7a86737..f59b478 100644
--- a/pyogp/lib/base/tests/test_udpconnection.py
+++ b/pyogp/lib/base/message/tests/test_udpconnection.py
@@ -8,7 +8,7 @@ from pyogp.lib.base.registration import init
 
 #local libraries
 #from pyogp.lib.base.message.udp_connection import MessageSystem
-from pyogp.lib.base.message.message_types import MsgType
+from pyogp.lib.base.message.types import MsgType
 from pyogp.lib.base.network.mockup_net import MockupUDPServer
 from pyogp.lib.base.message.message import Message, Block
 from pyogp.lib.base.message.interfaces import IHost
diff --git a/pyogp/lib/base/message/message_types.py b/pyogp/lib/base/message/types.py
similarity index 100%
rename from pyogp/lib/base/message/message_types.py
rename to pyogp/lib/base/message/types.py
diff --git a/pyogp/lib/base/message/udpdeserializer.py b/pyogp/lib/base/message/udpdeserializer.py
index 43b38e9..f448fef 100644
--- a/pyogp/lib/base/message/udpdeserializer.py
+++ b/pyogp/lib/base/message/udpdeserializer.py
@@ -7,13 +7,10 @@ from zope.component import getUtility
 #pyogp libs
 from interfaces import ITemplateDictionary
 from pyogp.lib.base.interfaces import IDeserialization
-from pyogp.lib.base.message.message_template import MsgData, MsgBlockData, \
-     MsgVariableData
-#import pyogp.lib.base.message_types
-from pyogp.lib.base.message.message_types import MsgType, MsgBlockType, \
-     MsgFrequency, PacketLayout, EndianType, PackFlags, sizeof
-from pyogp.lib.base.message.data_unpacker import DataUnpacker
-from pyogp.lib.base.message.interfaces import IUDPPacket
+from template import MsgData, MsgBlockData, MsgVariableData
+from types import MsgType, MsgBlockType, MsgFrequency, PacketLayout, EndianType, PackFlags, sizeof
+from data_unpacker import DataUnpacker
+from interfaces import IUDPPacket
 
 class UDPPacketDeserializer(grok.Adapter):
     grok.implements(IDeserialization)
diff --git a/pyogp/lib/base/message/udpdispatcher.py b/pyogp/lib/base/message/udpdispatcher.py
index a07073b..d6f6332 100644
--- a/pyogp/lib/base/message/udpdispatcher.py
+++ b/pyogp/lib/base/message/udpdispatcher.py
@@ -2,15 +2,14 @@ from zope.interface import implements
 from zope.component import getUtility
 from pyogp.lib.base.network.interfaces import IUDPClient
 
-from pyogp.lib.base.data import msg_tmpl, msg_details
-from pyogp.lib.base.message.circuit import CircuitManager
-from pyogp.lib.base.message.message_types import PacketLayout, PackFlags,\
-                 MsgType, EndianType, sizeof
-from pyogp.lib.base.message.data_unpacker import DataUnpacker
-from pyogp.lib.base.message.data_packer import DataPacker
+from data import msg_tmpl, msg_details
+from circuit import CircuitManager
+from types import PacketLayout, PackFlags, MsgType, EndianType, sizeof
+from data_unpacker import DataUnpacker
+from data_packer import DataPacker
 from pyogp.lib.base.interfaces import ISerialization, IDeserialization
-from pyogp.lib.base.message.interfaces import IUDPDispatcher, IUDPPacket
-from pyogp.lib.base.message.message import Message, Block
+from interfaces import IUDPDispatcher, IUDPPacket
+from message import Message, Block
 
 #maybe make a global utility
 class UDPDispatcher(object):
diff --git a/pyogp/lib/base/message/udpserializer.py b/pyogp/lib/base/message/udpserializer.py
index 2fb22c4..dd7c33f 100644
--- a/pyogp/lib/base/message/udpserializer.py
+++ b/pyogp/lib/base/message/udpserializer.py
@@ -5,14 +5,11 @@ from zope.component import getUtility
 from interfaces import ITemplateDictionary
 
 #pyogp libs
-from pyogp.lib.base.message.interfaces import IUDPPacket
-from pyogp.lib.base.message.message_template import MsgData, MsgBlockData, \
-     MsgVariableData
-#import pyogp.lib.base.message_types
-from pyogp.lib.base.message.message_types import MsgType, MsgBlockType, \
-                             MsgFrequency, EndianType, sizeof
-from pyogp.lib.base.message.data_packer import DataPacker
-#from pyogp.lib.base.message.packet import Packet
+from interfaces import IUDPPacket
+from template import MsgData, MsgBlockData, MsgVariableData
+from types import MsgType, MsgBlockType, MsgFrequency, EndianType, sizeof
+from data_packer import DataPacker
+
 from pyogp.lib.base.interfaces import ISerialization
 
 class UDPPacketSerializer(grok.Adapter):