From 1b1d20d6ac29c511d76ee3db83376edd2ae1c3f8 Mon Sep 17 00:00:00 2001
From: "locklainn.linden" <devnull@localhost>
Date: Fri, 25 Jul 2008 13:24:25 +0000
Subject: [PATCH] message code moved into its own package

---
 pyogp/lib/base/message/__init__.py               |   0
 pyogp/lib/base/message/__init__.pyc              | Bin 0 -> 163 bytes
 pyogp/lib/base/{ => message}/data_packer.py      |   2 +-
 pyogp/lib/base/message/data_packer.pyc           | Bin 0 -> 3552 bytes
 pyogp/lib/base/{ => message}/message_template.py |   8 ++------
 pyogp/lib/base/message/message_template.pyc      | Bin 0 -> 7716 bytes
 .../{ => message}/message_template_builder.py    |   6 +++---
 .../base/message/message_template_builder.pyc    | Bin 0 -> 6652 bytes
 .../base/{ => message}/message_template_dict.py  |   2 +-
 pyogp/lib/base/message/message_template_dict.pyc | Bin 0 -> 2268 bytes
 .../{ => message}/message_template_parser.py     |   2 +-
 .../lib/base/message/message_template_parser.pyc | Bin 0 -> 7786 bytes
 pyogp/lib/base/{ => message}/message_types.py    |   0
 pyogp/lib/base/message/message_types.pyc         | Bin 0 -> 3496 bytes
 pyogp/lib/base/{ => tests}/packet_test.py        |   4 ++--
 pyogp/lib/base/tests/test_template_builder.py    |  10 +++++-----
 pyogp/lib/base/tests/test_template_parser.py     |   8 ++++----
 17 files changed, 19 insertions(+), 23 deletions(-)
 create mode 100644 pyogp/lib/base/message/__init__.py
 create mode 100644 pyogp/lib/base/message/__init__.pyc
 rename pyogp/lib/base/{ => message}/data_packer.py (97%)
 create mode 100644 pyogp/lib/base/message/data_packer.pyc
 rename pyogp/lib/base/{ => message}/message_template.py (97%)
 create mode 100644 pyogp/lib/base/message/message_template.pyc
 rename pyogp/lib/base/{ => message}/message_template_builder.py (97%)
 create mode 100644 pyogp/lib/base/message/message_template_builder.pyc
 rename pyogp/lib/base/{ => message}/message_template_dict.py (96%)
 create mode 100644 pyogp/lib/base/message/message_template_dict.pyc
 rename pyogp/lib/base/{ => message}/message_template_parser.py (99%)
 create mode 100644 pyogp/lib/base/message/message_template_parser.pyc
 rename pyogp/lib/base/{ => message}/message_types.py (100%)
 create mode 100644 pyogp/lib/base/message/message_types.pyc
 rename pyogp/lib/base/{ => tests}/packet_test.py (99%)

diff --git a/pyogp/lib/base/message/__init__.py b/pyogp/lib/base/message/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pyogp/lib/base/message/__init__.pyc b/pyogp/lib/base/message/__init__.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e31b22d20fc1b9583fc8d872124f9d7a7f746f5c
GIT binary patch
literal 163
zcmdn|iI+=IIm;uN0SXv_v;z<qvjB+{28Lh_kcgiKkYGR~ihY1$$yPB*rI|S?#W6XF
zC8@<F@dcIn=>;*xMaeN>mR?R~l3r3`aVmrx1LVelxw)yu#fj;uG4b)4d6^~g@p=W7
W#T-BbZF2KdN^?@}K-LxmF#`bCB`AXc

literal 0
HcmV?d00001

diff --git a/pyogp/lib/base/data_packer.py b/pyogp/lib/base/message/data_packer.py
similarity index 97%
rename from pyogp/lib/base/data_packer.py
rename to pyogp/lib/base/message/data_packer.py
index eb59bd7..1bfb627 100644
--- a/pyogp/lib/base/data_packer.py
+++ b/pyogp/lib/base/message/data_packer.py
@@ -1,6 +1,6 @@
 import struct
 
-from pyogp.lib.base.message_types import MsgType
+from pyogp.lib.base.message.message_types import MsgType
 
 class DataPacker(object):
     def __init__(self):
diff --git a/pyogp/lib/base/message/data_packer.pyc b/pyogp/lib/base/message/data_packer.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3183e0dcea079ae50d091d334857dfd40a73a3c7
GIT binary patch
literal 3552
zcmc&$-A)@v6h6D_{{V490wHbHUR0G;C01JyidqyELZcu#hO7Z8$kNK*UC4&THlA@+
zs`QH9RO;LGP5LN(f%ZFR7JC9TQZAfecIJF%XXpIPnQ!K=e`YJc{QbwXkg~r#`XBMA
zRWuR)9XcjDFtSU>4y7&~xa340#U33x6y@l5qI05`2RR<zs_`7jzxZp`9EiGz=D9lB
zJsZTj0(rBeJ3F25I3AA8^0*B=>Lr>O1~D)3yfB41S@0-wMSvAggnVZEpg>VxG)0OE
zB9tg9icqGgBtnJ!R;`TLL$<|_hvx|%wFmTy=nYXIZQ`(;z;l-pkJjM81m}QV3+I77
z3m1TM7A^wkEnEUFShx&av~UHuWZ@gYWed*$S1deBYwX;drMhWURZDftsBT-Td84{x
zsqPxpf~8u7IXnD&W{9m?x~jU5uLzZJ1L<ul7wzK>(>*iYmg!!Yu4}qirb|qBYPv(y
zMYT^bi!PuUNa^T%5Q9l61p(^=rH4uH$j3X<GiaXg?*{wp{?__N<0tu=6?>0NO|tmy
z>O@}tZX&O)jEA=-!&}zymNmSE;Zo+9@~NeN3jNZxj{Y2nx<6djvze2P#(t)`|E}?o
zp1b@(^iB&aS1hdPg=;OGjyhUb$FsixjEB9X-}|5Oqfrvce&&=m8hd+No4S;JzOlXC
z(7gKmZfhr4-`w<VytD1^8gj^Ckc!j88hVmOZ9@vbZ+AyY8mV>)H<S(rXZ@o=TMfgu
zNcA-7*1H`Q8`uVH3p|OH>Kw)G2qYsV5fAHwGjS{kl3t>NfQv|pDW~krJJoA`^U#}L
z6@AE5!H$k8V+Y{P1r59|P=Ada!x7Lf{pOLz4)N&Rq5d4+fFK+Ot<wfMhE+11ORb&*
zHs#&Iq|_Al^m)sO&tWG`JKZ#vVnlI|Lao^oE_M-`{a##SjsGcs!xD$Cnd&458no+w
z0W{?dvq9N{Y?Xacy#ENvoyBj?z2lD4$W99Lehon*lad^hwL}PCBV&@jMdWi4@Bie3
zg|pH`W<e(sGDZ=lanJu8y~HRQq{+$%kI|z6vW|Wr2~x?g@szW{v1gP7<7xaAu;RGM
znQ=n)g`aUfF$<VPfNjrF6jrQ<W~1=QDfyN8<h@yPo&;<%<$#!WvVbz`;>8nkruPge
zl7Re&_<j<GUuTGCiX?Cov%eif#7?|#5dH)9lFRTT#BgODR=&9u0@ni<*Avz=)lYVq
zE4<_i6=ifI+k&f==|9l@0IRz!N2e59w$?SCbiyz^_CqWfpCH+SvB_mXvx!`56Y)Yw
ztb722DsXYT;8K32`8wJ?!yz&$HemrizouMpmj7(+5j?qEY-8`49N_(h>p<4-kh4=3
z#9VNu>^IX<mUm<C2PiVn<x-cOr@hWe90YO+2!fM-G)e*e&oJ2k5{+Kuc{az_{cK7h
zFrPQ0e~X)WZtil!<9#l*Nqizr<4WLj=D9Z1Z8Qa^yil%`b7fC{`LbsYVm?_k$MW{A
rqn=$eF8Y8^S!J%Be7)#*U*k3>CO$wYssxj3CjXB)EZHP8Zq@w{4~r@d

literal 0
HcmV?d00001

diff --git a/pyogp/lib/base/message_template.py b/pyogp/lib/base/message/message_template.py
similarity index 97%
rename from pyogp/lib/base/message_template.py
rename to pyogp/lib/base/message/message_template.py
index ba52f2c..72e1488 100644
--- a/pyogp/lib/base/message_template.py
+++ b/pyogp/lib/base/message/message_template.py
@@ -29,10 +29,6 @@ import re
 import pprint
        
 #local libraries
-from makepacketdict import makepacketdict, makereversepacketdict
-
-mypacketdictionary = makepacketdict()
-myreversedictionary = makereversepacketdict()
 
 """ can construct and deconstruct packet headers. Has nothing to
         do with the packet payload, yet. """
@@ -149,7 +145,7 @@ class MessageTemplate(object):
         return self.block_map[name]
         
 #these remain unformatted (by standard) because they are going to be moved    
-def decodeHeaderPair(frequency, num):
+"""def decodeHeaderPair(frequency, num):
     return mypacketdictionary[(frequency, num)]
 
 def decodeFrequency(header):
@@ -223,4 +219,4 @@ def encodeHeaderName(ack, sequenceNumber, packetName):
     
 def encodeHeader(ack, sequenceNumber, frequency, num):
     packetID = encodePacketID(frequency, num)
-    return ack + struct.pack('>LB', sequenceNumber, 0) + packetID
+    return ack + struct.pack('>LB', sequenceNumber, 0) + packetID"""
diff --git a/pyogp/lib/base/message/message_template.pyc b/pyogp/lib/base/message/message_template.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6e3af95268c0339e3ca3ab2556905a865e151ea1
GIT binary patch
literal 7716
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

literal 0
HcmV?d00001

diff --git a/pyogp/lib/base/message_template_builder.py b/pyogp/lib/base/message/message_template_builder.py
similarity index 97%
rename from pyogp/lib/base/message_template_builder.py
rename to pyogp/lib/base/message/message_template_builder.py
index 1cdbb60..6488429 100644
--- a/pyogp/lib/base/message_template_builder.py
+++ b/pyogp/lib/base/message/message_template_builder.py
@@ -2,11 +2,11 @@
 import struct
 
 #pyogp libs
-from pyogp.lib.base.message_template import MsgData, MsgBlockData, \
+from pyogp.lib.base.message.message_template import MsgData, MsgBlockData, \
      MsgVariableData
 #import pyogp.lib.base.message_types
-from pyogp.lib.base.message_types import MsgType, MsgBlockType, MsgFrequency, sizeof
-from pyogp.lib.base.data_packer import DataPacker
+from pyogp.lib.base.message.message_types import MsgType, MsgBlockType, MsgFrequency, sizeof
+from pyogp.lib.base.message.data_packer import DataPacker
 
 class MessageTemplateBuilder(object):
     """ This class builds messages at its high level, that is, keeping
diff --git a/pyogp/lib/base/message/message_template_builder.pyc b/pyogp/lib/base/message/message_template_builder.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8106381b6210753b026477fccecb6ffb5d3aa6f6
GIT binary patch
literal 6652
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
U%Ln%0A9Cl?Q1h0&8}PS(1J!5#HUIzs

literal 0
HcmV?d00001

diff --git a/pyogp/lib/base/message_template_dict.py b/pyogp/lib/base/message/message_template_dict.py
similarity index 96%
rename from pyogp/lib/base/message_template_dict.py
rename to pyogp/lib/base/message/message_template_dict.py
index 6987978..8796062 100644
--- a/pyogp/lib/base/message_template_dict.py
+++ b/pyogp/lib/base/message/message_template_dict.py
@@ -1,5 +1,5 @@
 from pyogp.lib.base.data import msg_tmpl
-from pyogp.lib.base.message_types import MsgFrequency
+from pyogp.lib.base.message.message_types import MsgFrequency
 
 class TemplateDictionary(object):
     def __init__(self, template_list):
diff --git a/pyogp/lib/base/message/message_template_dict.pyc b/pyogp/lib/base/message/message_template_dict.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..674c14eabe17d0c7d3af88f26a204a32b47f98cc
GIT binary patch
literal 2268
zcmcgt&5j#I5U!rFy=%jYC4ulG6a@*1Ir+vVtfGXhH@i}7#F!{q%Tddo>2*38j~#bg
ztfkE*$t5qskqhEQcoM`5z*ps&iI?PxZFjk=zn<>;>TiDkd$0A^pKp#6Dn51m-^Oq^
zAyWJlJtN8#4HPNX19}!v7SbSu9+IiinWD5tuZdm}oet`h)~O#g@VNa4pGaZmcOj;3
zqWyH9tyez8O4m(}7UucV<jKlk!NSi5_{f_>n|M3RM~hWu7$5TkhWie}5ZeQDaO)so
zBY6_Cbv&sNEaM4`5z7V*iu)0BO9F^;+~xCbLtMyVPXn6mlk!j$y;Ag2Q4ZEmfD`F}
zib=?-t?@(H#7^l)d}7aSQn-;>=Wpc8ER%bEjd#p)<C~at&J#0dhW=w{Q{&udVze*V
zJI~H3S5x>xwvCrIODoS<<K$L3*qQ9i@8O~H2+g-gSRfJZ6tm>!P>ygzcCqt%zM4(u
zL$^qVGHYjc+#ZjdS*t^+Ls1J$hNVT-C2U%IzLMx_ZFB3jW+%HA->ml3e$d2Me9rtC
z6QBQq$@y>W!NbSD(u;sD@Pkv~>42=F0|ej&{0t=^AF{VOI4yWPU?6`)>MdBWz)-;N
zH^D{))&#u13GP&2T|k7huw<7m*7rB*ETDtuJM>Tj&3WDP5agN7kv%sl3?#Zg`^7WZ
zHK|=rB`U{u@+4wc#Jp9O^3imi0cU02$5J1kVZ+hMqt2l|iaS3&==AQM>TajszjLqS
zKLvLG$A|AhJ_pk69G*Prz6ZPp@c883@w-sWcKRI%F3Eg3jW{^*E(^|1iDwyPNvq0Q
z?fha}X%(}DA7QvJAxP~|L+ytRbyc-CNBC|@e}L^pIw|_1FAb+BQX(OBBXlp<3<qah
z<fOzW##crEH527FLMq{WDu>hycZrG+G88F!nHEPh;z!m|<o%MB99+z|(gi-jJ)4a5
zc%|nfyZ8p{C9|^g^1m?Srd2URJG~Svj{8QixKixa=x`Eg4MG;Bp!K&<3l<S4X3_LG
zXSDWQ<yuc?=`w>FOVRVLm?^|xvA7QL)_9ryzil~YCv#;>J8r0Et9hjvHp8C0oc&cG
zm-~J@9r;m=W%3-e|A0mJZ&z=D)!evs_u}lEjh~vt%bi<g>2`7X!P@h;I71v$-p8xw
EU;I`bX#fBK

literal 0
HcmV?d00001

diff --git a/pyogp/lib/base/message_template_parser.py b/pyogp/lib/base/message/message_template_parser.py
similarity index 99%
rename from pyogp/lib/base/message_template_parser.py
rename to pyogp/lib/base/message/message_template_parser.py
index aa2b866..a5022de 100644
--- a/pyogp/lib/base/message_template_parser.py
+++ b/pyogp/lib/base/message/message_template_parser.py
@@ -7,7 +7,7 @@ import pprint
 #local libraries
 import message_template
 from pyogp.lib.base.data import msg_tmpl
-from pyogp.lib.base.message_types import MsgFrequency, MsgTrust, \
+from pyogp.lib.base.message.message_types import MsgFrequency, MsgTrust, \
      MsgEncoding, MsgDeprecation, MsgBlockType, MsgType
 
 class MessageTemplateParser(object):
diff --git a/pyogp/lib/base/message/message_template_parser.pyc b/pyogp/lib/base/message/message_template_parser.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ae253fdf1015115dcc43c6f45d6dfcd0301b6df8
GIT binary patch
literal 7786
zcmcgxTW=f36+TN+7wTf&Y{`o4Sg{kEi4&!<9p~=GG9^nXb;(k)6UO$2BG>ZT)RN+^
z5;+lpqAm)wK;QaMphfGVFGbOZ0{sK&Q-D4cX!>3R{R0L1*q8MC&g`z%ic|C@mc7H7
z^PM?6b1pMyX8-i>!M=Zd@#FcLM1OtweH%~kIf^>|TXI*VlGH7!STQ{#l}udEN+lcD
zb5hA^JtKF!q|q&vZm}pUD|dUO(JPf+Y2>Anmqwpd`lQh>m40aqNM%48gHjm;cTU^`
zatp8Ok{^oP7kR%jB=v4KD#KFm(aMO_d$lqu?wHi`awj9rezDw9_ON^lf-ET)I4SQd
z{4EtMRKs2ro56+?ZnheQZc+wNECw5MZFg(i^=tQ(1%%c1b`XaB2A%b5&AR7rga=H!
z=(gH!tr~hwKNc|4Xx8qo-fOvGkKxh!A=cd>sBXBcF5X!U-IZ!PaNCL6Ijk8x!ATS@
z=BP^MWT9b8=Lq#?w2~9MT*!j2mO&9em)Uz6#jbXxCWgfd(XiycB|or)>HxSa;$&n4
zjHswkR$#EKQo2}r-Ks#?tX#-J=2CDJWjyw&TVBJRs#Sfz8BVRcQ%g<X4S|ctqQIGl
z+Kco&TC+Pfx20+tBo?W_p_p(4lue@>Cq@F*-bZdbplZ9oQEP7dVR!~L=aGtZoE8<D
zNKn}Y>PANrxQ$yjtysWgir@p(YOh~k-}V~y;5uy*gih;TbE9=VXxFZ5ZMxyDPp?-4
z*EFxAd0m^)h_CM-xfw=#x@A1baXjA(9fuARun=p|8qVY`^Di+Vt*Hh)i3;?egC=3O
zS2B(^Jxja{4GTjukjgr<C6F;0_O&V7rW1#B=W46v`gLWphe;&jyB{a&d5mh{$Q-9y
zuO}}*3`#)%5Njw?;~Yp~OsWbFqK3J5)Kj4c%+k29MaLBB=$g~f)uxk^oiBRAtTg}9
zW8E8;-HdoSx^AaSuK5Qg2j{udC(T~5@VDY;#Cp%TH)4q)vW5`p5wBOhzf10Cq|+_C
z-CVuyK<ZgUOt*M>sY5Ep)FZp#?$bB)2-XEOF}O)!5bJcy)}PI?6A48y8KJ$hi+32I
z|IAoue523-@di_JqlxB~l#@xUfgCv2NGwC%kaY6me}G|PAVho8=&+)1?V-JCbVSkP
zd#G7IBgvzRa>>A}v*L_Ncu>4UI*dNN2+jy)^$B1OWK<=;gHer(HzD<YWk38dJ9|K9
z{n8l_@=Z#8K<b!nztj)N<OFbP6H@(MeX*G$=X*4fjBNlL0Bj92<S5BsNqC2K6q5-r
zHVDI*RmRf^<A^ejCyb*i4#R^u&KdK<oS%^00j(UN?K;LR7-)Sg(c@9^juG)AJrX^b
zMxRuaGSM9}kE^Hys+dDy9#5F3#Cu9Q2NF?4C(`H%MJWp1A?l=x8j|p7N`nv956hjL
zG;e|f?r<3WCzJlqh<8dlL$dX|Y=S<KMo;fYkEGE;jQV|08iXlfcSr~FtnL}lv5ryb
zz8eL=(KrBL23XAmz~>m>@c#^eGpZgFScq{dAErbA!cLK+A4^8}ym&7V_ZQ8)83s=(
zdJIDaI!!cuQM<x*8OWoFmdSlQE$cffi&`F$-JCct$u8cC%303OJIDIISx&{X9Ftw-
zA!e56q35x0oF%5=otOGkDk^H6h#QRL&Ox2_A*r8~&baKN`Lqsm43m0UybIC+h5#5B
z{{dDM;LoJ-R}}A4{QCw!mBwFH{E*@w8vJw`e@$^%8S>vY__JyJ_0;>P4E|gie<SsN
zG5DD@{$}d^Us^i;=hOIGsrP?o@E6kf#Z><X2A@vj-%a)ZzQJEi<8LbtV`F|F8vLa+
zeo67OX8s00m&RulKd<<d!Cy|}ms9e^;1|+(G1dP|I2-KuN*bS4+}QUsgTI=_=M*>g
zdtmU_()bm{Bl{a%*Y_6IcfQQ{yqiLFPl0F6v!{O~&Bi?e$bupWjfaB?-Z{?byknW1
z^Bt+bPFF_Gx%Iamvm9Vo`(7N>yVym><v!Nr2?mo_lHCb){jF)S_*^qP{oc-xkSZ76
zK!&h{1OS;1lZAjuO_U=}7pBiVtLad{4D)8b@WIXer=1&TKt^^TQfhvznbD$K_qI1R
zC!F^-ZfkBi=k0*XTrpsAv1ER3BX`E1$L^Z0T%4J??R~`-NoX0q8BJF8py1X+9yOMl
zVbnx2g6u1gV$H{~qFDzATNSt6)RxEORy)Oq32<-<YsHm)6iD5pMAPIv<7qPSE8}#6
zoSN!c+-`(kD{5S=w!P|l!&RN#%%fY}i*x)`XWG#dQb-l7y{bxEd+CDtJ$KgpUO10T
z3F9SC+3=Jjo^r%fzHnZ7=c4u;+MIEzbk(he&GtD@vs9`nA=N!5fDf^q_maG|RC;$C
z$$8u7S%8x)mDbi4ifY4|<>ivn7FI45i*{69S+-XLo-1am^{J1dsZRyoCvIU8R6Php
z#{&1R&CzKKHgmP&yE~y8p&T|_3wX62@oYW2aO!PW{bsWo){F;jw42*4r3I~q7i#TR
zqgf3@&SL)=Ashm6-zmnX9YUTHOUu`sIeYfqwb`Z1?>mdL<?^K~vmq6<I9ps;TYLmK
z4sd?q%KRgs2|#lT@68q;fpOxuk^?U_8-#5hZ|Stvu<5BfLEEl{N^4bXcVn=j;I^+c
zp7?m4_7Pe<Wkq%8w!33fVd~(elCx^Bl~-qradT-|32JzD!JC56W^n0&1s&FwpoQfk
zy3lJtsLa~SdjxjUu;QrMui^T(h8%4L_Tub{J$v~Q-$_eQBI4?6L<}TFq<JX0o;uz?
z4ca%IJkw_z<j7yMt=<XPNuV#ztUBd|r7NXbb7_F);#z5SVFd)v!NWn9vnAivOZLL0
z82~ydUMmn;=OqJ`z3#SEc^rWf)hKOuv-y#0)1ca3yt?WjqV+<8RYYu3N0cUYL@N7`
z9l;%w8Q@7h#m+#F=?wOy4m!0@F-e4*8<RA}ta53l^J*ePNku$Y3PaSW*QE`DH1hRc
z291RkN5enW<{F^7VPA~^qg1qFrP>r7GD7wRW4u~w59&5vLkbK-JyGj{TjRXp`M5Zs
zch$DrZPyQzbFQi(CK~h5jO?J2qrD6KxMHGv;0hxQv=^hw4G}-py4$v|@U2TIRLSd}
z&x;tFcRjYvVl9RuuT43Lk)Q!*ye6a*G4c~9N`duiSk(X~mlLf9)HoF2XwSI8#Z)=t
z`GKPV#>aHG!iDmYS3bu81Q)rOTHTppE8o>^b!W5EV`Z)3>;a{X;tFQS8nBLJqgrOn
z>b6EeO+A@>W*iqaCxD!=hOMJ`Ch?5(>L!zLgX`h?SW3nS(0pbjle`7IF?ZfNNKTcO
za9{+3nLhAzqn5Y&9#i=Q-^+i{*PwMUGl^LibhV<f9mlV3x{jk>;y9bl`gQ|No7=0+
zD>R$S<(}!a_HEy-*<5V6$OK%lx~+U)zN<!~bJ)Z#;|Y#}vU7;HM#US07VeXfqF$ND
zEt;nn%D4fVU;`H!A`@&OuOR`4STI-*(ezR&rjZHPI#DmS^tx1Ku!XZYuq*RBKT~<V
zY!+|)NN=ui$%;EF9f09SE1$^X2td#aCcX_akQ{^3Z)D)mljY{fgQ&^?6VJ!FJ<0^J
zL9%-Xczccn`>+wU^;fyJ^%Fcja;?sUn#x-WPN973|N7H3aVnsq^P2nS^WKwa6zBq)
zbZ%hLqQB@O#>QTLkp&M{lyDTkMB=O{+Q!EAk&!xRIzc~6vulo^yKI`8Bmo==f%M+Z
zWu7!$@dDk7lBQYJxO(rAq7l)*NQ@W%z`hDfGEH3$>2K{j$XZOmaQ}&x?uLg&oeDN>
zUEj?fz^IC4Y9<|gvKKzzcI4=Fdka|}uDZ=0!-0N@AqCvq#Ogsfb>;462Jw5`!rF!3
zQL9Fqb2gmtWjw(S3f%c`Xrv&vc9wYuRJ?&>XGV4|s?%y@6>s2-ot2%_>Y^Fr$CLD0
z6KgyG#?fVMy$1I@g=b8zL1o~egX=A7^hpBusb&3$vt+(As9U+A{d0`R{sjj`3N~%~
zmu#2~7p7n(XtqOjdiz(zXb7{>q5rSZuphAa4awXg6{C6{qj_Sdt2P?yn!&#?kbnuk
zV9TO$Xb?3{W&m46jR<GVH2X51U=9Tgb01e`@wWqb8PurP=Qwj))QZupwWs3@b4BPF
ziw${oeW1~ensvbq8KaN*%)%VRe0;Ef%i8Zz7}r-v(+?C;DDaz?(QWh%DA0YSrE`7E
zs-{P5Rz3ee_>I2J<go$fGkwtPpr!7C4G$cSQ(#(ezr$jl#hWbtz~T}LqZocUO1>9O
zGnG=s;BppPdl-z?zUg=kq^AXX1k~e_9)a{6qo;<wOuo5(2Zv}i#-6I}KXM#DMX~3n
qTKl%wlAssweA8qE7wLbxgbct>@h>}obZI&}{`dS)zCYhTX#E!uEsBi*

literal 0
HcmV?d00001

diff --git a/pyogp/lib/base/message_types.py b/pyogp/lib/base/message/message_types.py
similarity index 100%
rename from pyogp/lib/base/message_types.py
rename to pyogp/lib/base/message/message_types.py
diff --git a/pyogp/lib/base/message/message_types.pyc b/pyogp/lib/base/message/message_types.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7372d4e23bf9a33c7cb95fd3720b324ec54a0f2c
GIT binary patch
literal 3496
zcmchaTW=dh6vxMR=YDA#D3{VwF6I{KMHL`~aN>1h)whi8Kv$Mlj&~cmb?o5XAO-P)
zK;jLFN8XVTkBCpeBOifxz5sjy`2T0K$Bxq%q&9Z;c+PKUclP|}%$dz^|18Y@^!;}`
zU3L0N;P(?8{?9P3Ql3%|V#<xFZ<YE+srxpZctjII<H}7&G$k~l+;l`ULX*nPMs!AK
zO1ZNUofDc??tDZSgl3exNXO19cS$vJ%Xrpc9;V_SZ1#uUN6nKX?@UOW4CzG}#Dfq#
zJTKyjsdhry_)97~rF0_~LysOM$faR|ER5p}I)|R)1hd9D9J<GSx+%D$&fvf^Cn}pw
zr%|eIm#y$Q;8t4YW~n{__VT)v-z-}>T&c#!--X-#u)TlW>$`rt-w8ZFaE?xf2S;sx
z)NPyAM!&bevET8%&~3wQ8~4!j{my~cKK*q9MDA}KooEiiaQrw-IuXp^r{3v4D)u`E
zzG%ZJj5asWnARpW*2YdNJ0lA5svO1996@sgP1S-Gm~z>%EnRcAY6Z(Fmh;;Irw3G9
zWfOl07bDoPs?8A1g($yuFZ45^U#(RyNHY$&fFsl_6{S>h<b8hZ4Z0^HTN0g&Y}e43
zmJP`ir4(d~vWl1FIKZ@K&wv$6pIHT`sIA?WRo%MpRIElLzikDVajsnZ^f70i#hHp#
zD77k&Ik}FLJEiTN^QXpXXIf7w_o(3&9HEX$vyQMdo1<et5Dl3%M#JaOnAR|Us$rxa
zJLi~o)9P_mBDb2l)o5A;vlii2YX)3Qw5xc8mvDs9#sj7?qO}Iyq1ziAJmG*@<`7}4
zibTN*E0`n&;F>ewVuEI7-k1oQ%NaozyrYrV?F7ByK;ll|l$q%NTYsnLnrVed3szlQ
zTX|0RX=P~@>gOSHU<@xt6fVlwaYQwj%bj^Yxf`v488zx?OsD<YnbLuZiyh9MQTD8|
z=afCK>;+{nDtk%U%gSC+_NuZkDH~T^R`$A-8V-?TS(z4)dq8Cm)t2QZtZwk4eJS9c
z$J4F%1M}o;-n=_*-@Y|&-@PN<8{_VciSCVw?hSO0Zdsh*MR3k4M=h84ylyZY-40AH
zO%nH9r#oiq!^?J$v1N`1NV#w;HdnS<r9xPD;BMAx<#1WTDb<~Pp`a)IdQCSkCPQ98
zu<zgqGvxU$_fH<IZ(HPl!TSn3Dc(b3>S0_BvnqzSug2hySnQO?&+uP`Cxpk*|3~3T
z;R*1sg{Ook!F$5f!c*Y8!ZX5o{||&`h4cQ`h0h4*{bz*F3g`X*R#9AY!rA{%;q$`T
z|99aF!qect2wxPQ0slexlJG3}iST9NyiZ5?ig5NX311aX9c~K0B%IHGMfjR<>J!6!
zD!j9DEmnK~;)99CY%>FTd`akKX;|iatS3FzxE#x^X7XqjQGJz$dyc+FbDid88kS`J
z3eBrDuhFm~X{NV+gXT?|w`ks`VK(Xwns;g5gE6nc0n7FmozZw*Je`*XQ%3yWm)`Kf
zJ&fqHEUMUYEc*nHs!`jFG~9oPDr4S`H7k;4`O)0Mwb7W8heF>%YaG03Jsk!7EJpe$
X{Kw*B=7P@xxIT|>dOeA6dj0Bu<D1g#

literal 0
HcmV?d00001

diff --git a/pyogp/lib/base/packet_test.py b/pyogp/lib/base/tests/packet_test.py
similarity index 99%
rename from pyogp/lib/base/packet_test.py
rename to pyogp/lib/base/tests/packet_test.py
index dc884fe..d7b5d5a 100644
--- a/pyogp/lib/base/packet_test.py
+++ b/pyogp/lib/base/tests/packet_test.py
@@ -2,7 +2,7 @@ import unittest
 import message_template
 
 class PacketTest(unittest.TestCase):
-
+"""
     #testing each component
     def test_freqLow(self):
         assert message_template.decodeFrequency('\xFF\xFF\x01') == 'Low', '0xFFFF01 is supposed to be "Low"'
@@ -101,6 +101,6 @@ class PacketTest(unittest.TestCase):
     def test_encodeHeaderNameHigh(self):
         header = message_template.encodeHeaderName(message_template.LL_NONE, 1, 'StartPingCheck')
         assert header == '\x00\x00\x00\x00\x01\x00\x01', 'Outcome: ' + repr(header) + ' Expected: ' + r'\x00\x00\x00\x00\x01\x00\x01'
-
+"""
 if __name__ == "__main__":
     unittest.main()
diff --git a/pyogp/lib/base/tests/test_template_builder.py b/pyogp/lib/base/tests/test_template_builder.py
index 18a50c9..32a8403 100644
--- a/pyogp/lib/base/tests/test_template_builder.py
+++ b/pyogp/lib/base/tests/test_template_builder.py
@@ -4,11 +4,11 @@ from uuid import UUID
 
 #local libraries
 from pyogp.lib.base.data import msg_tmpl
-from pyogp.lib.base.message_template import MessageTemplate, MessageTemplateBlock, MessageTemplateVariable
-from pyogp.lib.base.message_template_parser import MessageTemplateParser
-from pyogp.lib.base.message_template_builder import MessageTemplateBuilder
-from pyogp.lib.base.message_template_dict import TemplateDictionary
-from pyogp.lib.base.message_types import MsgType
+from pyogp.lib.base.message.message_template import MessageTemplate, MessageTemplateBlock, MessageTemplateVariable
+from pyogp.lib.base.message.message_template_parser import MessageTemplateParser
+from pyogp.lib.base.message.message_template_builder import MessageTemplateBuilder
+from pyogp.lib.base.message.message_template_dict import TemplateDictionary
+from pyogp.lib.base.message.message_types import MsgType
 #from indra.base.lluuid import UUID
 
 class TestTemplateBuilder(unittest.TestCase):
diff --git a/pyogp/lib/base/tests/test_template_parser.py b/pyogp/lib/base/tests/test_template_parser.py
index 708f98b..9aa73c3 100644
--- a/pyogp/lib/base/tests/test_template_parser.py
+++ b/pyogp/lib/base/tests/test_template_parser.py
@@ -3,10 +3,10 @@ import unittest, doctest
 
 #local libraries
 from pyogp.lib.base.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, \
+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
 
 class TestDictionary(unittest.TestCase):