diff --git a/packaging/language/__init__.py b/packaging/language/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packaging/composer.py b/packaging/language/composer.py
similarity index 100%
rename from packaging/composer.py
rename to packaging/language/composer.py
diff --git a/packaging/cpanm.py b/packaging/language/cpanm.py
similarity index 100%
rename from packaging/cpanm.py
rename to packaging/language/cpanm.py
diff --git a/packaging/npm.py b/packaging/language/npm.py
similarity index 100%
rename from packaging/npm.py
rename to packaging/language/npm.py
diff --git a/packaging/os/__init__.py b/packaging/os/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packaging/homebrew.py b/packaging/os/homebrew.py
similarity index 100%
rename from packaging/homebrew.py
rename to packaging/os/homebrew.py
diff --git a/packaging/homebrew_cask.py b/packaging/os/homebrew_cask.py
similarity index 100%
rename from packaging/homebrew_cask.py
rename to packaging/os/homebrew_cask.py
diff --git a/packaging/homebrew_tap.py b/packaging/os/homebrew_tap.py
similarity index 100%
rename from packaging/homebrew_tap.py
rename to packaging/os/homebrew_tap.py
diff --git a/packaging/layman.py b/packaging/os/layman.py
similarity index 100%
rename from packaging/layman.py
rename to packaging/os/layman.py
diff --git a/packaging/macports.py b/packaging/os/macports.py
similarity index 100%
rename from packaging/macports.py
rename to packaging/os/macports.py
diff --git a/packaging/openbsd_pkg.py b/packaging/os/openbsd_pkg.py
similarity index 100%
rename from packaging/openbsd_pkg.py
rename to packaging/os/openbsd_pkg.py
diff --git a/packaging/opkg.py b/packaging/os/opkg.py
similarity index 100%
rename from packaging/opkg.py
rename to packaging/os/opkg.py
diff --git a/packaging/pacman.py b/packaging/os/pacman.py
similarity index 100%
rename from packaging/pacman.py
rename to packaging/os/pacman.py
diff --git a/packaging/pkgin.py b/packaging/os/pkgin.py
similarity index 100%
rename from packaging/pkgin.py
rename to packaging/os/pkgin.py
diff --git a/packaging/pkgng.py b/packaging/os/pkgng.py
similarity index 100%
rename from packaging/pkgng.py
rename to packaging/os/pkgng.py
diff --git a/packaging/pkgutil.py b/packaging/os/pkgutil.py
similarity index 100%
rename from packaging/pkgutil.py
rename to packaging/os/pkgutil.py
diff --git a/packaging/portage.py b/packaging/os/portage.py
similarity index 100%
rename from packaging/portage.py
rename to packaging/os/portage.py
diff --git a/packaging/portinstall.py b/packaging/os/portinstall.py
similarity index 100%
rename from packaging/portinstall.py
rename to packaging/os/portinstall.py
diff --git a/packaging/svr4pkg.py b/packaging/os/svr4pkg.py
similarity index 100%
rename from packaging/svr4pkg.py
rename to packaging/os/svr4pkg.py
diff --git a/packaging/swdepot.py b/packaging/os/swdepot.py
similarity index 100%
rename from packaging/swdepot.py
rename to packaging/os/swdepot.py
diff --git a/packaging/urpmi.py b/packaging/os/urpmi.py
similarity index 100%
rename from packaging/urpmi.py
rename to packaging/os/urpmi.py
diff --git a/packaging/zypper.py b/packaging/os/zypper.py
similarity index 100%
rename from packaging/zypper.py
rename to packaging/os/zypper.py
diff --git a/packaging/zypper_repository.py b/packaging/os/zypper_repository.py
similarity index 100%
rename from packaging/zypper_repository.py
rename to packaging/os/zypper_repository.py