diff --git a/database/mysql/__init__.py b/database/mysql/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/database/mysql_db.py b/database/mysql/mysql_db.py
similarity index 100%
rename from database/mysql_db.py
rename to database/mysql/mysql_db.py
diff --git a/database/mysql_user.py b/database/mysql/mysql_user.py
similarity index 100%
rename from database/mysql_user.py
rename to database/mysql/mysql_user.py
diff --git a/database/mysql_variables.py b/database/mysql/mysql_variables.py
similarity index 100%
rename from database/mysql_variables.py
rename to database/mysql/mysql_variables.py
diff --git a/database/postgresql/__init__.py b/database/postgresql/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/database/postgresql_db.py b/database/postgresql/postgresql_db.py
similarity index 100%
rename from database/postgresql_db.py
rename to database/postgresql/postgresql_db.py
diff --git a/database/postgresql_privs.py b/database/postgresql/postgresql_privs.py
similarity index 100%
rename from database/postgresql_privs.py
rename to database/postgresql/postgresql_privs.py
diff --git a/database/postgresql_user.py b/database/postgresql/postgresql_user.py
similarity index 100%
rename from database/postgresql_user.py
rename to database/postgresql/postgresql_user.py
diff --git a/packaging/language/__init__.py b/packaging/language/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packaging/easy_install.py b/packaging/language/easy_install.py
similarity index 100%
rename from packaging/easy_install.py
rename to packaging/language/easy_install.py
diff --git a/packaging/gem.py b/packaging/language/gem.py
similarity index 100%
rename from packaging/gem.py
rename to packaging/language/gem.py
diff --git a/packaging/pip.py b/packaging/language/pip.py
similarity index 100%
rename from packaging/pip.py
rename to packaging/language/pip.py
diff --git a/packaging/os/__init__.py b/packaging/os/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packaging/apt.py b/packaging/os/apt.py
similarity index 100%
rename from packaging/apt.py
rename to packaging/os/apt.py
diff --git a/packaging/apt_key.py b/packaging/os/apt_key.py
similarity index 100%
rename from packaging/apt_key.py
rename to packaging/os/apt_key.py
diff --git a/packaging/apt_repository.py b/packaging/os/apt_repository.py
similarity index 100%
rename from packaging/apt_repository.py
rename to packaging/os/apt_repository.py
diff --git a/packaging/apt_rpm.py b/packaging/os/apt_rpm.py
similarity index 100%
rename from packaging/apt_rpm.py
rename to packaging/os/apt_rpm.py
diff --git a/packaging/redhat_subscription.py b/packaging/os/redhat_subscription.py
similarity index 100%
rename from packaging/redhat_subscription.py
rename to packaging/os/redhat_subscription.py
diff --git a/packaging/rhn_channel.py b/packaging/os/rhn_channel.py
similarity index 100%
rename from packaging/rhn_channel.py
rename to packaging/os/rhn_channel.py
diff --git a/packaging/rhn_register.py b/packaging/os/rhn_register.py
similarity index 100%
rename from packaging/rhn_register.py
rename to packaging/os/rhn_register.py
diff --git a/packaging/rpm_key.py b/packaging/os/rpm_key.py
similarity index 100%
rename from packaging/rpm_key.py
rename to packaging/os/rpm_key.py
diff --git a/packaging/yum.py b/packaging/os/yum.py
similarity index 100%
rename from packaging/yum.py
rename to packaging/os/yum.py