3 files changed, 27 insertions, 19 deletions
diff --git a/python/skytools/__init__.py b/python/skytools/__init__.py
index c653c039..dc71872b 100644
--- a/python/skytools/__init__.py
+++ b/python/skytools/__init__.py
@@ -1,22 +1,30 @@
 
 """Tools for Python database scripts."""
 
+import skytools.quoting
+import skytools.config
+import skytools.psycopgwrapper
+import skytools.sqltools
+import skytools.gzlog
+import skytools.scripting
+import skytools.parsing
+import skytools.dbstruct
 
-from psycopgwrapper import *
-from config import *
-from dbstruct import *
-from gzlog import *
-from scripting import *
-from sqltools import *
-from quoting import *
-from parsing import *
+from skytools.psycopgwrapper import *
+from skytools.config import *
+from skytools.dbstruct import *
+from skytools.gzlog import *
+from skytools.scripting import *
+from skytools.sqltools import *
+from skytools.quoting import *
+from skytools.parsing import *
 
-__all__ = (psycopgwrapper.__all__
-        + config.__all__
-        + dbstruct.__all__
-        + gzlog.__all__
-        + scripting.__all__
-        + sqltools.__all__
-        + quoting.__all__
-        + parsing.__all__)
+__all__ = (skytools.psycopgwrapper.__all__
+        + skytools.config.__all__
+        + skytools.dbstruct.__all__
+        + skytools.gzlog.__all__
+        + skytools.scripting.__all__
+        + skytools.sqltools.__all__
+        + skytools.quoting.__all__
+        + skytools.parsing.__all__)
 
diff --git a/python/skytools/dbstruct.py b/python/skytools/dbstruct.py
index 39e3b838..c0cbd4c5 100644
--- a/python/skytools/dbstruct.py
+++ b/python/skytools/dbstruct.py
@@ -3,7 +3,7 @@
 
 import sys, re
 
-from sqltools import fq_name_parts, get_table_oid
+from skytools.sqltools import fq_name_parts, get_table_oid
 
 __all__ = ['TableStruct',
     'T_TABLE', 'T_CONSTRAINT', 'T_INDEX', 'T_TRIGGER',
diff --git a/python/skytools/quoting.py b/python/skytools/quoting.py
index 6f686bf8..8225c7b0 100644
--- a/python/skytools/quoting.py
+++ b/python/skytools/quoting.py
@@ -16,9 +16,9 @@ __all__ = [
 ]
 
 try:
-    from _cquoting import *
+    from skytools._cquoting import *
 except ImportError:
-    from _pyquoting import *
+    from skytools._pyquoting import *
 
 # 
 # SQL quoting