diff --git a/.gitignore b/.gitignore
index b496937..3d978be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 .ipynb_checkpoints
 docs/build/
-
-*.pyc
diff --git a/awips/dataaccess/DataAccessLayer.py b/awips/dataaccess/DataAccessLayer.py
index b6d7b59..4ab02b7 100644
--- a/awips/dataaccess/DataAccessLayer.py
+++ b/awips/dataaccess/DataAccessLayer.py
@@ -47,7 +47,7 @@ import subprocess
 THRIFT_HOST = "edex"
 USING_NATIVE_THRIFT = False
 
-if 'jep' in sys.modules:
+if sys.modules.has_key('jep'):
     # intentionally do not catch if this fails to import, we want it to
     # be obvious that something is configured wrong when running from within
     # Java instead of allowing false confidence and fallback behavior
diff --git a/dynamicserialize/__init__.py b/dynamicserialize/__init__.py
index d3a487b..c7a94fd 100644
--- a/dynamicserialize/__init__.py
+++ b/dynamicserialize/__init__.py
@@ -35,7 +35,7 @@
 __all__ = [
            ]
 
-import dynamicserialize.adapters as adapters
+import dstypes, adapters
 import DynamicSerializationManager
 
 class SerializationException(Exception):
diff --git a/dynamicserialize/adapters/__init__.py b/dynamicserialize/adapters/__init__.py
index f7ad667..26cbdcd 100644
--- a/dynamicserialize/adapters/__init__.py
+++ b/dynamicserialize/adapters/__init__.py
@@ -66,10 +66,10 @@ classAdapterRegistry = {}
 def getAdapterRegistry():
     import sys
     for x in __all__:
-        exec('import dynamicserialize.adapters.' + x)
+        exec 'import ' + x
         m = sys.modules['dynamicserialize.adapters.' + x]
         d = m.__dict__
-        if 'ClassAdapter' in d:
+        if d.has_key('ClassAdapter'):
             if isinstance(m.ClassAdapter, list):
                 for clz in m.ClassAdapter:
                     classAdapterRegistry[clz] = m
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py
index 236dac1..25c19fc 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py
@@ -26,7 +26,7 @@
 #
 ##
 
-from .ActiveTableKey import ActiveTableKey
+import ActiveTableKey
 import abc
 
 class ActiveTableRecord(object):
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py
index 94486cf..86a959c 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py
@@ -26,9 +26,9 @@
 #
 ##
 
-from .ActiveTableRecord import ActiveTableRecord
+import ActiveTableRecord
 
-class OperationalActiveTableRecord(ActiveTableRecord):
+class OperationalActiveTableRecord(ActiveTableRecord.ActiveTableRecord):
 
     def __init__(self):
         super(OperationalActiveTableRecord, self).__init__()
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py
index 91a9b09..d60e78a 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py
@@ -26,9 +26,9 @@
 #
 ##
 
-from .ActiveTableRecord import ActiveTableRecord
+import ActiveTableRecord
 
-class PracticeActiveTableRecord(ActiveTableRecord):
+class PracticeActiveTableRecord(ActiveTableRecord.ActiveTableRecord):
 
     def __init__(self):
         super(PracticeActiveTableRecord, self).__init__()
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py
index a209f1f..6dce1e6 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py
@@ -41,20 +41,20 @@ __all__ = [
             'response'
           ]
 
-from .ActiveTableKey import ActiveTableKey
-from .ActiveTableRecord import ActiveTableRecord
-from .ActiveTableMode import ActiveTableMode
-from .DumpActiveTableRequest import DumpActiveTableRequest
-from .DumpActiveTableResponse import DumpActiveTableResponse
-from .GetActiveTableDictRequest import GetActiveTableDictRequest
-from .GetActiveTableDictResponse import GetActiveTableDictResponse
-from .GetFourCharSitesRequest import GetFourCharSitesRequest
-from .GetFourCharSitesResponse import GetFourCharSitesResponse
-from .GetVtecAttributeRequest import GetVtecAttributeRequest
-from .GetVtecAttributeResponse import GetVtecAttributeResponse
-from .OperationalActiveTableRecord import OperationalActiveTableRecord
-from .PracticeActiveTableRecord import PracticeActiveTableRecord
-from .SendPracticeProductRequest import SendPracticeProductRequest
-from .VTECChange import VTECChange
-from .VTECTableChangeNotification import VTECTableChangeNotification
+from ActiveTableKey import ActiveTableKey
+from ActiveTableRecord import ActiveTableRecord
+from ActiveTableMode import ActiveTableMode
+from DumpActiveTableRequest import DumpActiveTableRequest
+from DumpActiveTableResponse import DumpActiveTableResponse
+from GetActiveTableDictRequest import GetActiveTableDictRequest
+from GetActiveTableDictResponse import GetActiveTableDictResponse
+from GetFourCharSitesRequest import GetFourCharSitesRequest
+from GetFourCharSitesResponse import GetFourCharSitesResponse
+from GetVtecAttributeRequest import GetVtecAttributeRequest
+from GetVtecAttributeResponse import GetVtecAttributeResponse
+from OperationalActiveTableRecord import OperationalActiveTableRecord
+from PracticeActiveTableRecord import PracticeActiveTableRecord
+from SendPracticeProductRequest import SendPracticeProductRequest
+from VTECChange import VTECChange
+from VTECTableChangeNotification import VTECTableChangeNotification
 
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/__init__.py
index 5d57bfb..f9a76ac 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/__init__.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/__init__.py
@@ -24,5 +24,5 @@ __all__ = [
             'DefaultDataRequest'
           ]
 
-from .DefaultDataRequest import DefaultDataRequest
+from DefaultDataRequest import DefaultDataRequest
 
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py
index 14b658f..e5b56c0 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/Level.py
@@ -45,7 +45,7 @@ INVALID_VALUE = numpy.float64(-999999)
 class Level(object):
 
     def __init__(self, levelString=None):
-        self.id = 0
+        self.id = 0L
         self.identifier = None
         self.masterLevel = None
         self.levelonevalue = INVALID_VALUE
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/__init__.py
index 97b4729..9e5a9fb 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/__init__.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/level/__init__.py
@@ -25,6 +25,6 @@ __all__ = [
             'MasterLevel'
           ]
 
-from .Level import Level
-from .MasterLevel import MasterLevel
+from Level import Level
+from MasterLevel import MasterLevel
 
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py
index 3a13605..d2f66b4 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/__init__.py
@@ -28,7 +28,7 @@ __all__ = [
             'stream'
           ]
 
-from .LocalizationContext import LocalizationContext
-from .LocalizationLevel import LocalizationLevel
-from .LocalizationType import LocalizationType
+from LocalizationContext import LocalizationContext
+from LocalizationLevel import LocalizationLevel
+from LocalizationType import LocalizationType
 
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py
index 6b3e028..04f3163 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py
@@ -20,7 +20,7 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
 
-from .Property import Property
+from Property import Property
 
 class Header(object):
 
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
index 6b9a3d0..15930ea 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
@@ -31,11 +31,7 @@ import struct
 import socket
 import os
 import pwd
-try:
-    import thread
-except ImportError:
-    #this means that we are in python 3.
-    import _thread as thread
+import thread
 
 class WsId(object):
 
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/__init__.py
index 7f0ab80..02c3271 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/__init__.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/__init__.py
@@ -40,8 +40,8 @@ __all__ = [
 #
 
 
-from .Body import Body
-from .Header import Header
-from .Message import Message
-from .Property import Property
-from .WsId import WsId
+from Body import Body
+from Header import Header
+from Message import Message
+from Property import Property
+from WsId import WsId
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py
index 1219dbb..7b20af8 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/DataTime.py
@@ -40,11 +40,7 @@ import calendar
 import datetime
 import numpy
 import time
-try:
-    import StringIO
-except ImportError:
-    #python2->3
-    import io.StringIO as StringIO
+import StringIO
 
 from dynamicserialize.dstypes.java.util import Date
 from dynamicserialize.dstypes.java.util import EnumSet
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py
index 5f570f5..a31aacc 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py
@@ -25,6 +25,6 @@ __all__ = [
             'TimeRange'
           ]
 
-from .DataTime import DataTime
-from .TimeRange import TimeRange
+from DataTime import DataTime
+from TimeRange import TimeRange
 
diff --git a/dynamicserialize/dstypes/com/vividsolutions/jts/geom/__init__.py b/dynamicserialize/dstypes/com/vividsolutions/jts/geom/__init__.py
index 18d2f36..95449c8 100644
--- a/dynamicserialize/dstypes/com/vividsolutions/jts/geom/__init__.py
+++ b/dynamicserialize/dstypes/com/vividsolutions/jts/geom/__init__.py
@@ -26,7 +26,7 @@ __all__ = [
             'Geometry'
           ]
 
-from .Coordinate import Coordinate
-from .Envelope import Envelope
-from .Geometry import Geometry
+from Coordinate import Coordinate
+from Envelope import Envelope
+from Geometry import Geometry
 
diff --git a/dynamicserialize/dstypes/java/awt/__init__.py b/dynamicserialize/dstypes/java/awt/__init__.py
index 7fd9f01..1a2a8b5 100644
--- a/dynamicserialize/dstypes/java/awt/__init__.py
+++ b/dynamicserialize/dstypes/java/awt/__init__.py
@@ -37,4 +37,4 @@ __all__ = [
            'Point',
            ]
 
-from .Point import Point
+from Point import Point
diff --git a/dynamicserialize/dstypes/java/lang/__init__.py b/dynamicserialize/dstypes/java/lang/__init__.py
index 47f0e2e..ffa213f 100644
--- a/dynamicserialize/dstypes/java/lang/__init__.py
+++ b/dynamicserialize/dstypes/java/lang/__init__.py
@@ -24,5 +24,5 @@ __all__ = [
             'StackTraceElement'
           ]
 
-from .StackTraceElement import StackTraceElement
+from StackTraceElement import StackTraceElement
 
diff --git a/dynamicserialize/dstypes/java/util/__init__.py b/dynamicserialize/dstypes/java/util/__init__.py
index 9068645..2126103 100644
--- a/dynamicserialize/dstypes/java/util/__init__.py
+++ b/dynamicserialize/dstypes/java/util/__init__.py
@@ -27,8 +27,8 @@ __all__ = [
             'GregorianCalendar'
           ]
 
-from .Calendar import Calendar
-from .Date import Date
-from .EnumSet import EnumSet
-from .GregorianCalendar import GregorianCalendar
+from Calendar import Calendar
+from Date import Date
+from EnumSet import EnumSet
+from GregorianCalendar import GregorianCalendar