diff --git a/dynamicserialize/__init__.py b/dynamicserialize/__init__.py
index c7a94fd..d3a487b 100644
--- a/dynamicserialize/__init__.py
+++ b/dynamicserialize/__init__.py
@@ -35,7 +35,7 @@
 __all__ = [
            ]
 
-import dstypes, adapters
+import dynamicserialize.adapters as adapters
 import DynamicSerializationManager
 
 class SerializationException(Exception):
diff --git a/dynamicserialize/adapters/__init__.py b/dynamicserialize/adapters/__init__.py
index 26cbdcd..f7ad667 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 ' + x
+        exec('import dynamicserialize.adapters.' + x)
         m = sys.modules['dynamicserialize.adapters.' + x]
         d = m.__dict__
-        if d.has_key('ClassAdapter'):
+        if 'ClassAdapter' in d:
             if isinstance(m.ClassAdapter, list):
                 for clz in m.ClassAdapter:
                     classAdapterRegistry[clz] = m
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 f9a76ac..5d57bfb 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/message/Header.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py
index 04f3163..6b3e028 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 15930ea..6b9a3d0 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
@@ -31,7 +31,11 @@ import struct
 import socket
 import os
 import pwd
-import thread
+try:
+    import thread
+except ImportError:
+    #this means that we are in python 3.
+    import _thread as 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 02c3271..7f0ab80 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/java/awt/__init__.py b/dynamicserialize/dstypes/java/awt/__init__.py
index 1a2a8b5..7fd9f01 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 ffa213f..47f0e2e 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