diff --git a/py/__init__.py b/base/py/__init__.py
similarity index 100%
rename from py/__init__.py
rename to base/py/__init__.py
diff --git a/py/app.py b/base/py/app.py
similarity index 100%
rename from py/app.py
rename to base/py/app.py
diff --git a/py/app_cocoa.py b/base/py/app_cocoa.py
similarity index 100%
rename from py/app_cocoa.py
rename to base/py/app_cocoa.py
diff --git a/py/app_me_cocoa.py b/base/py/app_me_cocoa.py
similarity index 100%
rename from py/app_me_cocoa.py
rename to base/py/app_me_cocoa.py
diff --git a/py/app_pe_cocoa.py b/base/py/app_pe_cocoa.py
similarity index 100%
rename from py/app_pe_cocoa.py
rename to base/py/app_pe_cocoa.py
diff --git a/py/app_se_cocoa.py b/base/py/app_se_cocoa.py
similarity index 100%
rename from py/app_se_cocoa.py
rename to base/py/app_se_cocoa.py
diff --git a/py/data.py b/base/py/data.py
similarity index 100%
rename from py/data.py
rename to base/py/data.py
diff --git a/py/data_me.py b/base/py/data_me.py
similarity index 100%
rename from py/data_me.py
rename to base/py/data_me.py
diff --git a/py/data_pe.py b/base/py/data_pe.py
similarity index 100%
rename from py/data_pe.py
rename to base/py/data_pe.py
diff --git a/py/directories.py b/base/py/directories.py
similarity index 100%
rename from py/directories.py
rename to base/py/directories.py
diff --git a/py/engine.py b/base/py/engine.py
similarity index 100%
rename from py/engine.py
rename to base/py/engine.py
diff --git a/py/export.py b/base/py/export.py
similarity index 100%
rename from py/export.py
rename to base/py/export.py
diff --git a/py/gen.py b/base/py/gen.py
similarity index 100%
rename from py/gen.py
rename to base/py/gen.py
diff --git a/py/ignore.py b/base/py/ignore.py
similarity index 100%
rename from py/ignore.py
rename to base/py/ignore.py
diff --git a/py/modules/block/block.pyx b/base/py/modules/block/block.pyx
similarity index 100%
rename from py/modules/block/block.pyx
rename to base/py/modules/block/block.pyx
diff --git a/py/modules/block/setup.py b/base/py/modules/block/setup.py
similarity index 100%
rename from py/modules/block/setup.py
rename to base/py/modules/block/setup.py
diff --git a/py/modules/cache/cache.pyx b/base/py/modules/cache/cache.pyx
similarity index 100%
rename from py/modules/cache/cache.pyx
rename to base/py/modules/cache/cache.pyx
diff --git a/py/modules/cache/setup.py b/base/py/modules/cache/setup.py
similarity index 100%
rename from py/modules/cache/setup.py
rename to base/py/modules/cache/setup.py
diff --git a/py/picture/__init__.py b/base/py/picture/__init__.py
similarity index 100%
rename from py/picture/__init__.py
rename to base/py/picture/__init__.py
diff --git a/py/picture/block.py b/base/py/picture/block.py
similarity index 100%
rename from py/picture/block.py
rename to base/py/picture/block.py
diff --git a/py/picture/cache.py b/base/py/picture/cache.py
similarity index 100%
rename from py/picture/cache.py
rename to base/py/picture/cache.py
diff --git a/py/picture/matchbase.py b/base/py/picture/matchbase.py
similarity index 100%
rename from py/picture/matchbase.py
rename to base/py/picture/matchbase.py
diff --git a/py/results.py b/base/py/results.py
similarity index 100%
rename from py/results.py
rename to base/py/results.py
diff --git a/py/scanner.py b/base/py/scanner.py
similarity index 100%
rename from py/scanner.py
rename to base/py/scanner.py
diff --git a/py/tests/__init__.py b/base/py/tests/__init__.py
similarity index 100%
rename from py/tests/__init__.py
rename to base/py/tests/__init__.py
diff --git a/py/tests/app_cocoa_test.py b/base/py/tests/app_cocoa_test.py
similarity index 100%
rename from py/tests/app_cocoa_test.py
rename to base/py/tests/app_cocoa_test.py
diff --git a/py/tests/app_test.py b/base/py/tests/app_test.py
similarity index 100%
rename from py/tests/app_test.py
rename to base/py/tests/app_test.py
diff --git a/py/tests/block_test.py b/base/py/tests/block_test.py
similarity index 100%
rename from py/tests/block_test.py
rename to base/py/tests/block_test.py
diff --git a/py/tests/cache_test.py b/base/py/tests/cache_test.py
similarity index 100%
rename from py/tests/cache_test.py
rename to base/py/tests/cache_test.py
diff --git a/py/tests/directories_test.py b/base/py/tests/directories_test.py
similarity index 100%
rename from py/tests/directories_test.py
rename to base/py/tests/directories_test.py
diff --git a/py/tests/engine_test.py b/base/py/tests/engine_test.py
similarity index 100%
rename from py/tests/engine_test.py
rename to base/py/tests/engine_test.py
diff --git a/py/tests/export_test.py b/base/py/tests/export_test.py
similarity index 100%
rename from py/tests/export_test.py
rename to base/py/tests/export_test.py
diff --git a/py/tests/ignore_test.py b/base/py/tests/ignore_test.py
similarity index 100%
rename from py/tests/ignore_test.py
rename to base/py/tests/ignore_test.py
diff --git a/py/tests/results_test.py b/base/py/tests/results_test.py
similarity index 100%
rename from py/tests/results_test.py
rename to base/py/tests/results_test.py
diff --git a/py/tests/scanner_test.py b/base/py/tests/scanner_test.py
similarity index 100%
rename from py/tests/scanner_test.py
rename to base/py/tests/scanner_test.py