diff --git a/base/py/picture/__init__.py b/pe/py/__init__.py
similarity index 100%
rename from base/py/picture/__init__.py
rename to pe/py/__init__.py
diff --git a/base/py/picture/block.py b/pe/py/block.py
similarity index 100%
rename from base/py/picture/block.py
rename to pe/py/block.py
diff --git a/base/py/picture/cache.py b/pe/py/cache.py
similarity index 100%
rename from base/py/picture/cache.py
rename to pe/py/cache.py
diff --git a/base/py/gen.py b/pe/py/gen.py
similarity index 63%
rename from base/py/gen.py
rename to pe/py/gen.py
index 0a842372..097f592c 100644
--- a/base/py/gen.py
+++ b/pe/py/gen.py
@@ -22,7 +22,7 @@ os.system('python setup.py build_ext --inplace')
 os.chdir(op.join('..', 'cache'))
 os.system('python setup.py build_ext --inplace')
 os.chdir(op.join('..', '..'))
-move(op.join('modules', 'block', '_block.so'), op.join('picture', '_block.so'))
-move(op.join('modules', 'block', '_block.pyd'), op.join('picture', '_block.pyd'))
-move(op.join('modules', 'cache', '_cache.so'), op.join('picture', '_cache.so'))
-move(op.join('modules', 'cache', '_cache.pyd'), op.join('picture', '_cache.pyd'))
+move(op.join('modules', 'block', '_block.so'), '.')
+move(op.join('modules', 'block', '_block.pyd'), '.')
+move(op.join('modules', 'cache', '_cache.so'), '.')
+move(op.join('modules', 'cache', '_cache.pyd'), '.')
diff --git a/base/py/picture/matchbase.py b/pe/py/matchbase.py
similarity index 100%
rename from base/py/picture/matchbase.py
rename to pe/py/matchbase.py
diff --git a/base/py/modules/block/block.pyx b/pe/py/modules/block/block.pyx
similarity index 100%
rename from base/py/modules/block/block.pyx
rename to pe/py/modules/block/block.pyx
diff --git a/base/py/modules/block/setup.py b/pe/py/modules/block/setup.py
similarity index 100%
rename from base/py/modules/block/setup.py
rename to pe/py/modules/block/setup.py
diff --git a/base/py/modules/cache/cache.pyx b/pe/py/modules/cache/cache.pyx
similarity index 100%
rename from base/py/modules/cache/cache.pyx
rename to pe/py/modules/cache/cache.pyx
diff --git a/base/py/modules/cache/setup.py b/pe/py/modules/cache/setup.py
similarity index 100%
rename from base/py/modules/cache/setup.py
rename to pe/py/modules/cache/setup.py