diff --git a/Examples/python/import_packages/Makefile b/Examples/python/import_packages/Makefile
index 72b424a90..129495cbd 100644
--- a/Examples/python/import_packages/Makefile
+++ b/Examples/python/import_packages/Makefile
@@ -10,7 +10,8 @@ import_packages_subdirs = \
 	from_init3 \
 	relativeimport1 \
 	relativeimport2 \
-	relativeimport3
+	relativeimport3 \
+        split_modules
 
 check: build
 	if test "x$(SRCDIR)" != x; then \
diff --git a/Examples/python/import_packages/split_wrapper/Makefile b/Examples/python/import_packages/split_modules/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/Makefile
rename to Examples/python/import_packages/split_modules/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/README b/Examples/python/import_packages/split_modules/README
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/README
rename to Examples/python/import_packages/split_modules/README
diff --git a/Examples/python/import_packages/split_wrapper/builtin/Makefile b/Examples/python/import_packages/split_modules/builtin/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin/Makefile
rename to Examples/python/import_packages/split_modules/builtin/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/builtin/pkg1/Makefile b/Examples/python/import_packages/split_modules/builtin/pkg1/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin/pkg1/Makefile
rename to Examples/python/import_packages/split_modules/builtin/pkg1/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/builtin/pkg1/README b/Examples/python/import_packages/split_modules/builtin/pkg1/README
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin/pkg1/README
rename to Examples/python/import_packages/split_modules/builtin/pkg1/README
diff --git a/Examples/python/import_packages/split_wrapper/builtin/pkg1/__init__.py b/Examples/python/import_packages/split_modules/builtin/pkg1/__init__.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin/pkg1/__init__.py
rename to Examples/python/import_packages/split_modules/builtin/pkg1/__init__.py
diff --git a/Examples/python/import_packages/split_wrapper/builtin/pkg1/foo.i b/Examples/python/import_packages/split_modules/builtin/pkg1/foo.i
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin/pkg1/foo.i
rename to Examples/python/import_packages/split_modules/builtin/pkg1/foo.i
diff --git a/Examples/python/import_packages/split_wrapper/builtin/runme.py b/Examples/python/import_packages/split_modules/builtin/runme.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin/runme.py
rename to Examples/python/import_packages/split_modules/builtin/runme.py
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/Makefile b/Examples/python/import_packages/split_modules/builtin_nopy3/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_nopy3/Makefile
rename to Examples/python/import_packages/split_modules/builtin_nopy3/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/Makefile b/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/Makefile
rename to Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/README b/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/README
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/README
rename to Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/README
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/__init__.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/__init__.py
rename to Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/__init__.py
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/foo.i b/Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/foo.i
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_nopy3/pkg1/foo.i
rename to Examples/python/import_packages/split_modules/builtin_nopy3/pkg1/foo.i
diff --git a/Examples/python/import_packages/split_wrapper/builtin_nopy3/runme.py b/Examples/python/import_packages/split_modules/builtin_nopy3/runme.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_nopy3/runme.py
rename to Examples/python/import_packages/split_modules/builtin_nopy3/runme.py
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split/Makefile b/Examples/python/import_packages/split_modules/builtin_split/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_split/Makefile
rename to Examples/python/import_packages/split_modules/builtin_split/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split/foo.i b/Examples/python/import_packages/split_modules/builtin_split/foo.i
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_split/foo.i
rename to Examples/python/import_packages/split_modules/builtin_split/foo.i
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split/pkg1/README b/Examples/python/import_packages/split_modules/builtin_split/pkg1/README
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_split/pkg1/README
rename to Examples/python/import_packages/split_modules/builtin_split/pkg1/README
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split/pkg1/__init__.py b/Examples/python/import_packages/split_modules/builtin_split/pkg1/__init__.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_split/pkg1/__init__.py
rename to Examples/python/import_packages/split_modules/builtin_split/pkg1/__init__.py
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split/runme.py b/Examples/python/import_packages/split_modules/builtin_split/runme.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_split/runme.py
rename to Examples/python/import_packages/split_modules/builtin_split/runme.py
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/Makefile b/Examples/python/import_packages/split_modules/builtin_split_nopy3/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_split_nopy3/Makefile
rename to Examples/python/import_packages/split_modules/builtin_split_nopy3/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/foo.i b/Examples/python/import_packages/split_modules/builtin_split_nopy3/foo.i
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_split_nopy3/foo.i
rename to Examples/python/import_packages/split_modules/builtin_split_nopy3/foo.i
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/pkg1/README b/Examples/python/import_packages/split_modules/builtin_split_nopy3/pkg1/README
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_split_nopy3/pkg1/README
rename to Examples/python/import_packages/split_modules/builtin_split_nopy3/pkg1/README
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_modules/builtin_split_nopy3/pkg1/__init__.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_split_nopy3/pkg1/__init__.py
rename to Examples/python/import_packages/split_modules/builtin_split_nopy3/pkg1/__init__.py
diff --git a/Examples/python/import_packages/split_wrapper/builtin_split_nopy3/runme.py b/Examples/python/import_packages/split_modules/builtin_split_nopy3/runme.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/builtin_split_nopy3/runme.py
rename to Examples/python/import_packages/split_modules/builtin_split_nopy3/runme.py
diff --git a/Examples/python/import_packages/split_wrapper/vanilla/Makefile b/Examples/python/import_packages/split_modules/vanilla/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla/Makefile
rename to Examples/python/import_packages/split_modules/vanilla/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/vanilla/pkg1/Makefile b/Examples/python/import_packages/split_modules/vanilla/pkg1/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla/pkg1/Makefile
rename to Examples/python/import_packages/split_modules/vanilla/pkg1/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/vanilla/pkg1/README b/Examples/python/import_packages/split_modules/vanilla/pkg1/README
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla/pkg1/README
rename to Examples/python/import_packages/split_modules/vanilla/pkg1/README
diff --git a/Examples/python/import_packages/split_wrapper/vanilla/pkg1/__init__.py b/Examples/python/import_packages/split_modules/vanilla/pkg1/__init__.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla/pkg1/__init__.py
rename to Examples/python/import_packages/split_modules/vanilla/pkg1/__init__.py
diff --git a/Examples/python/import_packages/split_wrapper/vanilla/pkg1/foo.i b/Examples/python/import_packages/split_modules/vanilla/pkg1/foo.i
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla/pkg1/foo.i
rename to Examples/python/import_packages/split_modules/vanilla/pkg1/foo.i
diff --git a/Examples/python/import_packages/split_wrapper/vanilla/runme.py b/Examples/python/import_packages/split_modules/vanilla/runme.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla/runme.py
rename to Examples/python/import_packages/split_modules/vanilla/runme.py
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/Makefile b/Examples/python/import_packages/split_modules/vanilla_nopy3/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_nopy3/Makefile
rename to Examples/python/import_packages/split_modules/vanilla_nopy3/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/Makefile b/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/Makefile
rename to Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/README b/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/README
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/README
rename to Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/README
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/__init__.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/__init__.py
rename to Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/__init__.py
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/foo.i b/Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/foo.i
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_nopy3/pkg1/foo.i
rename to Examples/python/import_packages/split_modules/vanilla_nopy3/pkg1/foo.i
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_nopy3/runme.py b/Examples/python/import_packages/split_modules/vanilla_nopy3/runme.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_nopy3/runme.py
rename to Examples/python/import_packages/split_modules/vanilla_nopy3/runme.py
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split/Makefile b/Examples/python/import_packages/split_modules/vanilla_split/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_split/Makefile
rename to Examples/python/import_packages/split_modules/vanilla_split/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split/foo.i b/Examples/python/import_packages/split_modules/vanilla_split/foo.i
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_split/foo.i
rename to Examples/python/import_packages/split_modules/vanilla_split/foo.i
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split/pkg1/README b/Examples/python/import_packages/split_modules/vanilla_split/pkg1/README
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_split/pkg1/README
rename to Examples/python/import_packages/split_modules/vanilla_split/pkg1/README
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split/pkg1/__init__.py b/Examples/python/import_packages/split_modules/vanilla_split/pkg1/__init__.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_split/pkg1/__init__.py
rename to Examples/python/import_packages/split_modules/vanilla_split/pkg1/__init__.py
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split/runme.py b/Examples/python/import_packages/split_modules/vanilla_split/runme.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_split/runme.py
rename to Examples/python/import_packages/split_modules/vanilla_split/runme.py
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/Makefile b/Examples/python/import_packages/split_modules/vanilla_split_nopy3/Makefile
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/Makefile
rename to Examples/python/import_packages/split_modules/vanilla_split_nopy3/Makefile
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/foo.i b/Examples/python/import_packages/split_modules/vanilla_split_nopy3/foo.i
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/foo.i
rename to Examples/python/import_packages/split_modules/vanilla_split_nopy3/foo.i
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/pkg1/README b/Examples/python/import_packages/split_modules/vanilla_split_nopy3/pkg1/README
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/pkg1/README
rename to Examples/python/import_packages/split_modules/vanilla_split_nopy3/pkg1/README
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/pkg1/__init__.py b/Examples/python/import_packages/split_modules/vanilla_split_nopy3/pkg1/__init__.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/pkg1/__init__.py
rename to Examples/python/import_packages/split_modules/vanilla_split_nopy3/pkg1/__init__.py
diff --git a/Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/runme.py b/Examples/python/import_packages/split_modules/vanilla_split_nopy3/runme.py
similarity index 100%
rename from Examples/python/import_packages/split_wrapper/vanilla_split_nopy3/runme.py
rename to Examples/python/import_packages/split_modules/vanilla_split_nopy3/runme.py