diff --git a/scripts/update_api.py b/scripts/update_api.py
index 733d5b1fa..5295b19b1 100755
--- a/scripts/update_api.py
+++ b/scripts/update_api.py
@@ -1600,8 +1600,8 @@ def write_core_py_preamble(core_py):
   core_py.write('# Automatically generated file\n')
   core_py.write('import sys, os\n')
   core_py.write('import ctypes\n')
-  core_py.write('from z3types import *\n')
-  core_py.write('from z3consts import *\n')
+  core_py.write('from .z3types import *\n')
+  core_py.write('from .z3consts import *\n')
   core_py.write(
 """
 _lib = None
diff --git a/src/api/python/z3/__init__.py b/src/api/python/z3/__init__.py
new file mode 100644
index 000000000..c4f08371f
--- /dev/null
+++ b/src/api/python/z3/__init__.py
@@ -0,0 +1,10 @@
+from .z3 import *
+
+from . import z3core
+from . import z3num
+from . import z3poly
+from . import z3printer
+from . import z3rcf
+from . import z3types
+from . import z3util
+from . import z3consts
diff --git a/src/api/python/z3.py b/src/api/python/z3/z3.py
similarity index 99%
rename from src/api/python/z3.py
rename to src/api/python/z3/z3.py
index 83e9eaae9..d7571a3c7 100644
--- a/src/api/python/z3.py
+++ b/src/api/python/z3/z3.py
@@ -41,10 +41,10 @@ Z3 exceptions:
 ...   print("failed: %s" % ex)
 failed: sort mismatch
 """
-from z3core import *
-from z3types import *
-from z3consts import *
-from z3printer import *
+from .z3core import *
+from .z3types import *
+from .z3consts import *
+from .z3printer import *
 from fractions import Fraction
 import sys
 import io
diff --git a/src/api/python/z3num.py b/src/api/python/z3/z3num.py
similarity index 99%
rename from src/api/python/z3num.py
rename to src/api/python/z3/z3num.py
index b219829d3..14d8550e6 100644
--- a/src/api/python/z3num.py
+++ b/src/api/python/z3/z3num.py
@@ -5,9 +5,9 @@
 #
 # Author: Leonardo de Moura (leonardo)
 ############################################
-from z3 import *
-from z3core import *
-from z3printer import *
+from .z3 import *
+from .z3core import *
+from .z3printer import *
 from fractions import Fraction
 
 def _to_numeral(num, ctx=None):
diff --git a/src/api/python/z3poly.py b/src/api/python/z3/z3poly.py
similarity index 98%
rename from src/api/python/z3poly.py
rename to src/api/python/z3/z3poly.py
index 0b8bf9457..4a5cac46c 100644
--- a/src/api/python/z3poly.py
+++ b/src/api/python/z3/z3poly.py
@@ -5,7 +5,7 @@
 #
 # Author: Leonardo de Moura (leonardo)
 ############################################
-from z3 import *
+from .z3 import *
 
 def subresultants(p, q, x):
     """
diff --git a/src/api/python/z3printer.py b/src/api/python/z3/z3printer.py
similarity index 99%
rename from src/api/python/z3printer.py
rename to src/api/python/z3/z3printer.py
index c8d69900a..e02c28a96 100644
--- a/src/api/python/z3printer.py
+++ b/src/api/python/z3/z3printer.py
@@ -6,8 +6,8 @@
 # Author: Leonardo de Moura (leonardo)
 ############################################
 import sys, io, z3
-from z3consts import *
-from z3core import *
+from .z3consts import *
+from .z3core import *
 from ctypes import *
 
 ##############################
diff --git a/src/api/python/z3rcf.py b/src/api/python/z3/z3rcf.py
similarity index 98%
rename from src/api/python/z3rcf.py
rename to src/api/python/z3/z3rcf.py
index 84c724910..9d6f2f6ad 100644
--- a/src/api/python/z3rcf.py
+++ b/src/api/python/z3/z3rcf.py
@@ -9,9 +9,9 @@
 #
 # Author: Leonardo de Moura (leonardo)
 ############################################
-from z3 import *
-from z3core import *
-from z3printer import *
+from .z3 import *
+from .z3core import *
+from .z3printer import *
 from fractions import Fraction
 
 def _to_rcfnum(num, ctx=None):
diff --git a/src/api/python/z3types.py b/src/api/python/z3/z3types.py
similarity index 99%
rename from src/api/python/z3types.py
rename to src/api/python/z3/z3types.py
index 44b19d33a..8b585e0ee 100644
--- a/src/api/python/z3types.py
+++ b/src/api/python/z3/z3types.py
@@ -6,7 +6,7 @@
 # Author: Leonardo de Moura (leonardo)
 ############################################
 
-import ctypes, z3core
+import ctypes
 
 class Z3Exception(Exception):
     def __init__(self, value):
diff --git a/src/api/python/z3util.py b/src/api/python/z3/z3util.py
similarity index 99%
rename from src/api/python/z3util.py
rename to src/api/python/z3/z3util.py
index 2494461cf..fe7e76b86 100644
--- a/src/api/python/z3util.py
+++ b/src/api/python/z3/z3util.py
@@ -11,7 +11,7 @@ Usage:
 import common_z3 as CM_Z3
 """
 
-from z3 import *
+from .z3 import *
 
 def vset(seq, idfun=None, as_list=True):
     # This functions preserves the order of arguments while removing duplicates.