diff --git a/lib/pisi/__init__.py b/pisi/__init__.py
similarity index 100%
rename from lib/pisi/__init__.py
rename to pisi/__init__.py
diff --git a/lib/pisi/actionsapi/__init__.py b/pisi/actionsapi/__init__.py
similarity index 100%
rename from lib/pisi/actionsapi/__init__.py
rename to pisi/actionsapi/__init__.py
diff --git a/lib/pisi/actionsapi/autotools.py b/pisi/actionsapi/autotools.py
similarity index 100%
rename from lib/pisi/actionsapi/autotools.py
rename to pisi/actionsapi/autotools.py
diff --git a/lib/pisi/actionsapi/gnuconfig.py b/pisi/actionsapi/gnuconfig.py
similarity index 100%
rename from lib/pisi/actionsapi/gnuconfig.py
rename to pisi/actionsapi/gnuconfig.py
diff --git a/lib/pisi/actionsapi/libtoolize.py b/pisi/actionsapi/libtoolize.py
similarity index 100%
rename from lib/pisi/actionsapi/libtoolize.py
rename to pisi/actionsapi/libtoolize.py
diff --git a/lib/pisi/actionsapi/shell.py b/pisi/actionsapi/shell.py
similarity index 100%
rename from lib/pisi/actionsapi/shell.py
rename to pisi/actionsapi/shell.py
diff --git a/lib/pisi/actionsapi/utils.py b/pisi/actionsapi/utils.py
similarity index 100%
rename from lib/pisi/actionsapi/utils.py
rename to pisi/actionsapi/utils.py
diff --git a/lib/pisi/actionsapi/var_lib_pisi/portage-1.4.1.patch b/pisi/actionsapi/var_lib_pisi/portage-1.4.1.patch
similarity index 100%
rename from lib/pisi/actionsapi/var_lib_pisi/portage-1.4.1.patch
rename to pisi/actionsapi/var_lib_pisi/portage-1.4.1.patch
diff --git a/lib/pisi/actionsapi/var_lib_pisi/sed-1.4.0.patch b/pisi/actionsapi/var_lib_pisi/sed-1.4.0.patch
similarity index 100%
rename from lib/pisi/actionsapi/var_lib_pisi/sed-1.4.0.patch
rename to pisi/actionsapi/var_lib_pisi/sed-1.4.0.patch
diff --git a/lib/pisi/archive.py b/pisi/archive.py
similarity index 100%
rename from lib/pisi/archive.py
rename to pisi/archive.py
diff --git a/lib/pisi/build.py b/pisi/build.py
similarity index 100%
rename from lib/pisi/build.py
rename to pisi/build.py
diff --git a/lib/pisi/colors.py b/pisi/colors.py
similarity index 100%
rename from lib/pisi/colors.py
rename to pisi/colors.py
diff --git a/lib/pisi/context.py b/pisi/context.py
similarity index 100%
rename from lib/pisi/context.py
rename to pisi/context.py
diff --git a/lib/pisi/dependency.py b/pisi/dependency.py
similarity index 100%
rename from lib/pisi/dependency.py
rename to pisi/dependency.py
diff --git a/lib/pisi/fetcher.py b/pisi/fetcher.py
similarity index 100%
rename from lib/pisi/fetcher.py
rename to pisi/fetcher.py
diff --git a/lib/pisi/install.py b/pisi/install.py
similarity index 100%
rename from lib/pisi/install.py
rename to pisi/install.py
diff --git a/lib/pisi/installdb.py b/pisi/installdb.py
similarity index 100%
rename from lib/pisi/installdb.py
rename to pisi/installdb.py
diff --git a/lib/pisi/oo.py b/pisi/oo.py
similarity index 100%
rename from lib/pisi/oo.py
rename to pisi/oo.py
diff --git a/lib/pisi/package.py b/pisi/package.py
similarity index 100%
rename from lib/pisi/package.py
rename to pisi/package.py
diff --git a/lib/pisi/packagedb.py b/pisi/packagedb.py
similarity index 100%
rename from lib/pisi/packagedb.py
rename to pisi/packagedb.py
diff --git a/lib/pisi/sourcedb.py b/pisi/sourcedb.py
similarity index 100%
rename from lib/pisi/sourcedb.py
rename to pisi/sourcedb.py
diff --git a/lib/pisi/specfile.py b/pisi/specfile.py
similarity index 100%
rename from lib/pisi/specfile.py
rename to pisi/specfile.py
diff --git a/lib/pisi/ui.py b/pisi/ui.py
similarity index 100%
rename from lib/pisi/ui.py
rename to pisi/ui.py
diff --git a/lib/pisi/util.py b/pisi/util.py
similarity index 100%
rename from lib/pisi/util.py
rename to pisi/util.py
diff --git a/lib/pisi/xmlfile.py b/pisi/xmlfile.py
similarity index 100%
rename from lib/pisi/xmlfile.py
rename to pisi/xmlfile.py