diff --git a/lang/chardet/Makefile b/lang/python/chardet/Makefile
similarity index 100%
rename from lang/chardet/Makefile
rename to lang/python/chardet/Makefile
diff --git a/lang/django-appconf/Makefile b/lang/python/django-appconf/Makefile
similarity index 100%
rename from lang/django-appconf/Makefile
rename to lang/python/django-appconf/Makefile
diff --git a/lang/django-compressor/Makefile b/lang/python/django-compressor/Makefile
similarity index 100%
rename from lang/django-compressor/Makefile
rename to lang/python/django-compressor/Makefile
diff --git a/lang/django-constance/Makefile b/lang/python/django-constance/Makefile
similarity index 100%
rename from lang/django-constance/Makefile
rename to lang/python/django-constance/Makefile
diff --git a/lang/django-jsonfield/Makefile b/lang/python/django-jsonfield/Makefile
similarity index 100%
rename from lang/django-jsonfield/Makefile
rename to lang/python/django-jsonfield/Makefile
diff --git a/lang/django-picklefield/Makefile b/lang/python/django-picklefield/Makefile
similarity index 100%
rename from lang/django-picklefield/Makefile
rename to lang/python/django-picklefield/Makefile
diff --git a/lang/django-postoffice/Makefile b/lang/python/django-postoffice/Makefile
similarity index 100%
rename from lang/django-postoffice/Makefile
rename to lang/python/django-postoffice/Makefile
diff --git a/lang/django-restframework/Makefile b/lang/python/django-restframework/Makefile
similarity index 100%
rename from lang/django-restframework/Makefile
rename to lang/python/django-restframework/Makefile
diff --git a/lang/django-statici18n/Makefile b/lang/python/django-statici18n/Makefile
similarity index 100%
rename from lang/django-statici18n/Makefile
rename to lang/python/django-statici18n/Makefile
diff --git a/lang/django/Makefile b/lang/python/django/Makefile
similarity index 100%
rename from lang/django/Makefile
rename to lang/python/django/Makefile
diff --git a/lang/et_xmlfile/Makefile b/lang/python/et_xmlfile/Makefile
similarity index 100%
rename from lang/et_xmlfile/Makefile
rename to lang/python/et_xmlfile/Makefile
diff --git a/lang/flup/Makefile b/lang/python/flup/Makefile
similarity index 100%
rename from lang/flup/Makefile
rename to lang/python/flup/Makefile
diff --git a/lang/gunicorn/Makefile b/lang/python/gunicorn/Makefile
similarity index 100%
rename from lang/gunicorn/Makefile
rename to lang/python/gunicorn/Makefile
diff --git a/lang/jdcal/Makefile b/lang/python/jdcal/Makefile
similarity index 100%
rename from lang/jdcal/Makefile
rename to lang/python/jdcal/Makefile
diff --git a/lang/micropython-lib/Makefile b/lang/python/micropython-lib/Makefile
similarity index 100%
rename from lang/micropython-lib/Makefile
rename to lang/python/micropython-lib/Makefile
diff --git a/lang/micropython/Makefile b/lang/python/micropython/Makefile
similarity index 100%
rename from lang/micropython/Makefile
rename to lang/python/micropython/Makefile
diff --git a/lang/micropython/patches/000-Makefile-no-errors b/lang/python/micropython/patches/000-Makefile-no-errors
similarity index 100%
rename from lang/micropython/patches/000-Makefile-no-errors
rename to lang/python/micropython/patches/000-Makefile-no-errors
diff --git a/lang/openpyxl/Makefile b/lang/python/openpyxl/Makefile
similarity index 100%
rename from lang/openpyxl/Makefile
rename to lang/python/openpyxl/Makefile
diff --git a/lang/pillow/Makefile b/lang/python/pillow/Makefile
similarity index 100%
rename from lang/pillow/Makefile
rename to lang/python/pillow/Makefile
diff --git a/lang/pillow/patches/010-fix-paths.patch b/lang/python/pillow/patches/010-fix-paths.patch
similarity index 100%
rename from lang/pillow/patches/010-fix-paths.patch
rename to lang/python/pillow/patches/010-fix-paths.patch
diff --git a/lang/python-attrs/Makefile b/lang/python/python-attrs/Makefile
similarity index 100%
rename from lang/python-attrs/Makefile
rename to lang/python/python-attrs/Makefile
diff --git a/lang/python-cffi/Makefile b/lang/python/python-cffi/Makefile
similarity index 100%
rename from lang/python-cffi/Makefile
rename to lang/python/python-cffi/Makefile
diff --git a/lang/python-crcmod/Makefile b/lang/python/python-crcmod/Makefile
similarity index 100%
rename from lang/python-crcmod/Makefile
rename to lang/python/python-crcmod/Makefile
diff --git a/lang/python-crypto/Makefile b/lang/python/python-crypto/Makefile
similarity index 100%
rename from lang/python-crypto/Makefile
rename to lang/python/python-crypto/Makefile
diff --git a/lang/python-crypto/patches/001-no-host-paths.patch b/lang/python/python-crypto/patches/001-no-host-paths.patch
similarity index 100%
rename from lang/python-crypto/patches/001-no-host-paths.patch
rename to lang/python/python-crypto/patches/001-no-host-paths.patch
diff --git a/lang/python-crypto/patches/002-fix-endianness-detect.patch b/lang/python/python-crypto/patches/002-fix-endianness-detect.patch
similarity index 100%
rename from lang/python-crypto/patches/002-fix-endianness-detect.patch
rename to lang/python/python-crypto/patches/002-fix-endianness-detect.patch
diff --git a/lang/python-cryptography/Makefile b/lang/python/python-cryptography/Makefile
similarity index 100%
rename from lang/python-cryptography/Makefile
rename to lang/python/python-cryptography/Makefile
diff --git a/lang/python-cryptography/patches/001-disable-setup-requirements.patch b/lang/python/python-cryptography/patches/001-disable-setup-requirements.patch
similarity index 100%
rename from lang/python-cryptography/patches/001-disable-setup-requirements.patch
rename to lang/python/python-cryptography/patches/001-disable-setup-requirements.patch
diff --git a/lang/python-dateutil/Makefile b/lang/python/python-dateutil/Makefile
similarity index 100%
rename from lang/python-dateutil/Makefile
rename to lang/python/python-dateutil/Makefile
diff --git a/lang/python-dns/Makefile b/lang/python/python-dns/Makefile
similarity index 100%
rename from lang/python-dns/Makefile
rename to lang/python/python-dns/Makefile
diff --git a/lang/python-egenix-mx-base/Makefile b/lang/python/python-egenix-mx-base/Makefile
similarity index 100%
rename from lang/python-egenix-mx-base/Makefile
rename to lang/python/python-egenix-mx-base/Makefile
diff --git a/lang/python-enum34/Makefile b/lang/python/python-enum34/Makefile
similarity index 100%
rename from lang/python-enum34/Makefile
rename to lang/python/python-enum34/Makefile
diff --git a/lang/python-enum34/patches/001-omit-docs.patch b/lang/python/python-enum34/patches/001-omit-docs.patch
similarity index 100%
rename from lang/python-enum34/patches/001-omit-docs.patch
rename to lang/python/python-enum34/patches/001-omit-docs.patch
diff --git a/lang/python-gmpy2/Makefile b/lang/python/python-gmpy2/Makefile
similarity index 100%
rename from lang/python-gmpy2/Makefile
rename to lang/python/python-gmpy2/Makefile
diff --git a/lang/python-idna/Makefile b/lang/python/python-idna/Makefile
similarity index 100%
rename from lang/python-idna/Makefile
rename to lang/python/python-idna/Makefile
diff --git a/lang/python-ipaddress/Makefile b/lang/python/python-ipaddress/Makefile
similarity index 100%
rename from lang/python-ipaddress/Makefile
rename to lang/python/python-ipaddress/Makefile
diff --git a/lang/python-ldap/Makefile b/lang/python/python-ldap/Makefile
similarity index 100%
rename from lang/python-ldap/Makefile
rename to lang/python/python-ldap/Makefile
diff --git a/lang/python-ldap/patches/010-setup_cfg.patch b/lang/python/python-ldap/patches/010-setup_cfg.patch
similarity index 100%
rename from lang/python-ldap/patches/010-setup_cfg.patch
rename to lang/python/python-ldap/patches/010-setup_cfg.patch
diff --git a/lang/python-mysql/Makefile b/lang/python/python-mysql/Makefile
similarity index 100%
rename from lang/python-mysql/Makefile
rename to lang/python/python-mysql/Makefile
diff --git a/lang/python-mysql/patches/010-threadsafe.patch b/lang/python/python-mysql/patches/010-threadsafe.patch
similarity index 100%
rename from lang/python-mysql/patches/010-threadsafe.patch
rename to lang/python/python-mysql/patches/010-threadsafe.patch
diff --git a/lang/python-packages/Makefile b/lang/python/python-packages/Makefile
similarity index 100%
rename from lang/python-packages/Makefile
rename to lang/python/python-packages/Makefile
diff --git a/lang/python-packages/README.md b/lang/python/python-packages/README.md
similarity index 100%
rename from lang/python-packages/README.md
rename to lang/python/python-packages/README.md
diff --git a/lang/python-parsley/Makefile b/lang/python/python-parsley/Makefile
similarity index 100%
rename from lang/python-parsley/Makefile
rename to lang/python/python-parsley/Makefile
diff --git a/lang/python-parsley/patches/001-omit-tests.patch b/lang/python/python-parsley/patches/001-omit-tests.patch
similarity index 100%
rename from lang/python-parsley/patches/001-omit-tests.patch
rename to lang/python/python-parsley/patches/001-omit-tests.patch
diff --git a/lang/python-pcapy/Makefile b/lang/python/python-pcapy/Makefile
similarity index 100%
rename from lang/python-pcapy/Makefile
rename to lang/python/python-pcapy/Makefile
diff --git a/lang/python-ply/Makefile b/lang/python/python-ply/Makefile
similarity index 100%
rename from lang/python-ply/Makefile
rename to lang/python/python-ply/Makefile
diff --git a/lang/python-psycopg2/Makefile b/lang/python/python-psycopg2/Makefile
similarity index 100%
rename from lang/python-psycopg2/Makefile
rename to lang/python/python-psycopg2/Makefile
diff --git a/lang/python-pyasn1-modules/Makefile b/lang/python/python-pyasn1-modules/Makefile
similarity index 100%
rename from lang/python-pyasn1-modules/Makefile
rename to lang/python/python-pyasn1-modules/Makefile
diff --git a/lang/python-pyasn1/Makefile b/lang/python/python-pyasn1/Makefile
similarity index 100%
rename from lang/python-pyasn1/Makefile
rename to lang/python/python-pyasn1/Makefile
diff --git a/lang/python-pycparser/Makefile b/lang/python/python-pycparser/Makefile
similarity index 100%
rename from lang/python-pycparser/Makefile
rename to lang/python/python-pycparser/Makefile
diff --git a/lang/python-pycparser/patches/001-use-external-ply.patch b/lang/python/python-pycparser/patches/001-use-external-ply.patch
similarity index 100%
rename from lang/python-pycparser/patches/001-use-external-ply.patch
rename to lang/python/python-pycparser/patches/001-use-external-ply.patch
diff --git a/lang/python-pyopenssl/Makefile b/lang/python/python-pyopenssl/Makefile
similarity index 100%
rename from lang/python-pyopenssl/Makefile
rename to lang/python/python-pyopenssl/Makefile
diff --git a/lang/python-pyptlib/Makefile b/lang/python/python-pyptlib/Makefile
similarity index 100%
rename from lang/python-pyptlib/Makefile
rename to lang/python/python-pyptlib/Makefile
diff --git a/lang/python-pyserial/Makefile b/lang/python/python-pyserial/Makefile
similarity index 100%
rename from lang/python-pyserial/Makefile
rename to lang/python/python-pyserial/Makefile
diff --git a/lang/python-service-identity/Makefile b/lang/python/python-service-identity/Makefile
similarity index 100%
rename from lang/python-service-identity/Makefile
rename to lang/python/python-service-identity/Makefile
diff --git a/lang/python-six/Makefile b/lang/python/python-six/Makefile
similarity index 100%
rename from lang/python-six/Makefile
rename to lang/python/python-six/Makefile
diff --git a/lang/python-txsocksx/Makefile b/lang/python/python-txsocksx/Makefile
similarity index 100%
rename from lang/python-txsocksx/Makefile
rename to lang/python/python-txsocksx/Makefile
diff --git a/lang/python-txsocksx/patches/001-omit-tests.patch b/lang/python/python-txsocksx/patches/001-omit-tests.patch
similarity index 100%
rename from lang/python-txsocksx/patches/001-omit-tests.patch
rename to lang/python/python-txsocksx/patches/001-omit-tests.patch
diff --git a/lang/python-txsocksx/patches/002-do-not-use-vcversioner.patch b/lang/python/python-txsocksx/patches/002-do-not-use-vcversioner.patch
similarity index 100%
rename from lang/python-txsocksx/patches/002-do-not-use-vcversioner.patch
rename to lang/python/python-txsocksx/patches/002-do-not-use-vcversioner.patch
diff --git a/lang/python-urllib3/Makefile b/lang/python/python-urllib3/Makefile
similarity index 100%
rename from lang/python-urllib3/Makefile
rename to lang/python/python-urllib3/Makefile
diff --git a/lang/python-yaml/Makefile b/lang/python/python-yaml/Makefile
similarity index 100%
rename from lang/python-yaml/Makefile
rename to lang/python/python-yaml/Makefile
diff --git a/lang/python/Makefile b/lang/python/python/Makefile
similarity index 100%
rename from lang/python/Makefile
rename to lang/python/python/Makefile
diff --git a/lang/python/files/config.site b/lang/python/python/files/config.site
similarity index 100%
rename from lang/python/files/config.site
rename to lang/python/python/files/config.site
diff --git a/lang/python/files/pip.conf b/lang/python/python/files/pip.conf
similarity index 100%
rename from lang/python/files/pip.conf
rename to lang/python/python/files/pip.conf
diff --git a/lang/python/files/python-host.mk b/lang/python/python/files/python-host.mk
similarity index 100%
rename from lang/python/files/python-host.mk
rename to lang/python/python/files/python-host.mk
diff --git a/lang/python/files/python-package-codecs.mk b/lang/python/python/files/python-package-codecs.mk
similarity index 100%
rename from lang/python/files/python-package-codecs.mk
rename to lang/python/python/files/python-package-codecs.mk
diff --git a/lang/python/files/python-package-compiler.mk b/lang/python/python/files/python-package-compiler.mk
similarity index 100%
rename from lang/python/files/python-package-compiler.mk
rename to lang/python/python/files/python-package-compiler.mk
diff --git a/lang/python/files/python-package-ctypes.mk b/lang/python/python/files/python-package-ctypes.mk
similarity index 100%
rename from lang/python/files/python-package-ctypes.mk
rename to lang/python/python/files/python-package-ctypes.mk
diff --git a/lang/python/files/python-package-db.mk b/lang/python/python/files/python-package-db.mk
similarity index 100%
rename from lang/python/files/python-package-db.mk
rename to lang/python/python/files/python-package-db.mk
diff --git a/lang/python/files/python-package-decimal.mk b/lang/python/python/files/python-package-decimal.mk
similarity index 100%
rename from lang/python/files/python-package-decimal.mk
rename to lang/python/python/files/python-package-decimal.mk
diff --git a/lang/python/files/python-package-dev.mk b/lang/python/python/files/python-package-dev.mk
similarity index 100%
rename from lang/python/files/python-package-dev.mk
rename to lang/python/python/files/python-package-dev.mk
diff --git a/lang/python/files/python-package-distutils.mk b/lang/python/python/files/python-package-distutils.mk
similarity index 100%
rename from lang/python/files/python-package-distutils.mk
rename to lang/python/python/files/python-package-distutils.mk
diff --git a/lang/python/files/python-package-email.mk b/lang/python/python/files/python-package-email.mk
similarity index 100%
rename from lang/python/files/python-package-email.mk
rename to lang/python/python/files/python-package-email.mk
diff --git a/lang/python/files/python-package-gdbm.mk b/lang/python/python/files/python-package-gdbm.mk
similarity index 100%
rename from lang/python/files/python-package-gdbm.mk
rename to lang/python/python/files/python-package-gdbm.mk
diff --git a/lang/python/files/python-package-install.sh b/lang/python/python/files/python-package-install.sh
similarity index 100%
rename from lang/python/files/python-package-install.sh
rename to lang/python/python/files/python-package-install.sh
diff --git a/lang/python/files/python-package-lib2to3.mk b/lang/python/python/files/python-package-lib2to3.mk
similarity index 100%
rename from lang/python/files/python-package-lib2to3.mk
rename to lang/python/python/files/python-package-lib2to3.mk
diff --git a/lang/python/files/python-package-logging.mk b/lang/python/python/files/python-package-logging.mk
similarity index 100%
rename from lang/python/files/python-package-logging.mk
rename to lang/python/python/files/python-package-logging.mk
diff --git a/lang/python/files/python-package-multiprocessing.mk b/lang/python/python/files/python-package-multiprocessing.mk
similarity index 100%
rename from lang/python/files/python-package-multiprocessing.mk
rename to lang/python/python/files/python-package-multiprocessing.mk
diff --git a/lang/python/files/python-package-ncurses.mk b/lang/python/python/files/python-package-ncurses.mk
similarity index 100%
rename from lang/python/files/python-package-ncurses.mk
rename to lang/python/python/files/python-package-ncurses.mk
diff --git a/lang/python/files/python-package-openssl.mk b/lang/python/python/files/python-package-openssl.mk
similarity index 100%
rename from lang/python/files/python-package-openssl.mk
rename to lang/python/python/files/python-package-openssl.mk
diff --git a/lang/python/files/python-package-pip.mk b/lang/python/python/files/python-package-pip.mk
similarity index 100%
rename from lang/python/files/python-package-pip.mk
rename to lang/python/python/files/python-package-pip.mk
diff --git a/lang/python/files/python-package-pydoc.mk b/lang/python/python/files/python-package-pydoc.mk
similarity index 100%
rename from lang/python/files/python-package-pydoc.mk
rename to lang/python/python/files/python-package-pydoc.mk
diff --git a/lang/python/files/python-package-setuptools.mk b/lang/python/python/files/python-package-setuptools.mk
similarity index 100%
rename from lang/python/files/python-package-setuptools.mk
rename to lang/python/python/files/python-package-setuptools.mk
diff --git a/lang/python/files/python-package-sqlite3.mk b/lang/python/python/files/python-package-sqlite3.mk
similarity index 100%
rename from lang/python/files/python-package-sqlite3.mk
rename to lang/python/python/files/python-package-sqlite3.mk
diff --git a/lang/python/files/python-package-unittest.mk b/lang/python/python/files/python-package-unittest.mk
similarity index 100%
rename from lang/python/files/python-package-unittest.mk
rename to lang/python/python/files/python-package-unittest.mk
diff --git a/lang/python/files/python-package-xml.mk b/lang/python/python/files/python-package-xml.mk
similarity index 100%
rename from lang/python/files/python-package-xml.mk
rename to lang/python/python/files/python-package-xml.mk
diff --git a/lang/python/files/python-package.mk b/lang/python/python/files/python-package.mk
similarity index 100%
rename from lang/python/files/python-package.mk
rename to lang/python/python/files/python-package.mk
diff --git a/lang/python/files/python-version.mk b/lang/python/python/files/python-version.mk
similarity index 100%
rename from lang/python/files/python-version.mk
rename to lang/python/python/files/python-version.mk
diff --git a/lang/python/patches/001-enable-zlib.patch b/lang/python/python/patches/001-enable-zlib.patch
similarity index 100%
rename from lang/python/patches/001-enable-zlib.patch
rename to lang/python/python/patches/001-enable-zlib.patch
diff --git a/lang/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch b/lang/python/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch
similarity index 100%
rename from lang/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch
rename to lang/python/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch
diff --git a/lang/python/patches/003-do-not-compile-tests-at-build.patch b/lang/python/python/patches/003-do-not-compile-tests-at-build.patch
similarity index 100%
rename from lang/python/patches/003-do-not-compile-tests-at-build.patch
rename to lang/python/python/patches/003-do-not-compile-tests-at-build.patch
diff --git a/lang/python/patches/004-do-not-write-bytes-codes.patch b/lang/python/python/patches/004-do-not-write-bytes-codes.patch
similarity index 100%
rename from lang/python/patches/004-do-not-write-bytes-codes.patch
rename to lang/python/python/patches/004-do-not-write-bytes-codes.patch
diff --git a/lang/python/patches/006-remove-debian-multiarch-support.patch b/lang/python/python/patches/006-remove-debian-multiarch-support.patch
similarity index 100%
rename from lang/python/patches/006-remove-debian-multiarch-support.patch
rename to lang/python/python/patches/006-remove-debian-multiarch-support.patch
diff --git a/lang/python/patches/007-distutils-do-not-adjust-path.patch b/lang/python/python/patches/007-distutils-do-not-adjust-path.patch
similarity index 100%
rename from lang/python/patches/007-distutils-do-not-adjust-path.patch
rename to lang/python/python/patches/007-distutils-do-not-adjust-path.patch
diff --git a/lang/python/patches/008-distutils-use-python-sysroot.patch b/lang/python/python/patches/008-distutils-use-python-sysroot.patch
similarity index 100%
rename from lang/python/patches/008-distutils-use-python-sysroot.patch
rename to lang/python/python/patches/008-distutils-use-python-sysroot.patch
diff --git a/lang/python/patches/009-do-not-use-dblib_dir-when-cross-compiling.patch b/lang/python/python/patches/009-do-not-use-dblib_dir-when-cross-compiling.patch
similarity index 100%
rename from lang/python/patches/009-do-not-use-dblib_dir-when-cross-compiling.patch
rename to lang/python/python/patches/009-do-not-use-dblib_dir-when-cross-compiling.patch
diff --git a/lang/python/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch b/lang/python/python/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
similarity index 100%
rename from lang/python/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
rename to lang/python/python/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
diff --git a/lang/python/patches/011-remove-setupterm-definition.patch b/lang/python/python/patches/011-remove-setupterm-definition.patch
similarity index 100%
rename from lang/python/patches/011-remove-setupterm-definition.patch
rename to lang/python/python/patches/011-remove-setupterm-definition.patch
diff --git a/lang/python3-bottle/Makefile b/lang/python/python3-bottle/Makefile
similarity index 100%
rename from lang/python3-bottle/Makefile
rename to lang/python/python3-bottle/Makefile
diff --git a/lang/python3/Makefile b/lang/python/python3/Makefile
similarity index 100%
rename from lang/python3/Makefile
rename to lang/python/python3/Makefile
diff --git a/lang/python3/files/config.site b/lang/python/python3/files/config.site
similarity index 100%
rename from lang/python3/files/config.site
rename to lang/python/python3/files/config.site
diff --git a/lang/python3/files/python3-host.mk b/lang/python/python3/files/python3-host.mk
similarity index 100%
rename from lang/python3/files/python3-host.mk
rename to lang/python/python3/files/python3-host.mk
diff --git a/lang/python3/files/python3-package-asyncio.mk b/lang/python/python3/files/python3-package-asyncio.mk
similarity index 100%
rename from lang/python3/files/python3-package-asyncio.mk
rename to lang/python/python3/files/python3-package-asyncio.mk
diff --git a/lang/python3/files/python3-package-codecs.mk b/lang/python/python3/files/python3-package-codecs.mk
similarity index 100%
rename from lang/python3/files/python3-package-codecs.mk
rename to lang/python/python3/files/python3-package-codecs.mk
diff --git a/lang/python3/files/python3-package-ctypes.mk b/lang/python/python3/files/python3-package-ctypes.mk
similarity index 100%
rename from lang/python3/files/python3-package-ctypes.mk
rename to lang/python/python3/files/python3-package-ctypes.mk
diff --git a/lang/python3/files/python3-package-dbm.mk b/lang/python/python3/files/python3-package-dbm.mk
similarity index 100%
rename from lang/python3/files/python3-package-dbm.mk
rename to lang/python/python3/files/python3-package-dbm.mk
diff --git a/lang/python3/files/python3-package-decimal.mk b/lang/python/python3/files/python3-package-decimal.mk
similarity index 100%
rename from lang/python3/files/python3-package-decimal.mk
rename to lang/python/python3/files/python3-package-decimal.mk
diff --git a/lang/python3/files/python3-package-dev.mk b/lang/python/python3/files/python3-package-dev.mk
similarity index 100%
rename from lang/python3/files/python3-package-dev.mk
rename to lang/python/python3/files/python3-package-dev.mk
diff --git a/lang/python3/files/python3-package-distutils.mk b/lang/python/python3/files/python3-package-distutils.mk
similarity index 100%
rename from lang/python3/files/python3-package-distutils.mk
rename to lang/python/python3/files/python3-package-distutils.mk
diff --git a/lang/python3/files/python3-package-email.mk b/lang/python/python3/files/python3-package-email.mk
similarity index 100%
rename from lang/python3/files/python3-package-email.mk
rename to lang/python/python3/files/python3-package-email.mk
diff --git a/lang/python3/files/python3-package-gdbm.mk b/lang/python/python3/files/python3-package-gdbm.mk
similarity index 100%
rename from lang/python3/files/python3-package-gdbm.mk
rename to lang/python/python3/files/python3-package-gdbm.mk
diff --git a/lang/python3/files/python3-package-install.sh b/lang/python/python3/files/python3-package-install.sh
similarity index 100%
rename from lang/python3/files/python3-package-install.sh
rename to lang/python/python3/files/python3-package-install.sh
diff --git a/lang/python3/files/python3-package-lib2to3.mk b/lang/python/python3/files/python3-package-lib2to3.mk
similarity index 100%
rename from lang/python3/files/python3-package-lib2to3.mk
rename to lang/python/python3/files/python3-package-lib2to3.mk
diff --git a/lang/python3/files/python3-package-logging.mk b/lang/python/python3/files/python3-package-logging.mk
similarity index 100%
rename from lang/python3/files/python3-package-logging.mk
rename to lang/python/python3/files/python3-package-logging.mk
diff --git a/lang/python3/files/python3-package-lzma.mk b/lang/python/python3/files/python3-package-lzma.mk
similarity index 100%
rename from lang/python3/files/python3-package-lzma.mk
rename to lang/python/python3/files/python3-package-lzma.mk
diff --git a/lang/python3/files/python3-package-multiprocessing.mk b/lang/python/python3/files/python3-package-multiprocessing.mk
similarity index 100%
rename from lang/python3/files/python3-package-multiprocessing.mk
rename to lang/python/python3/files/python3-package-multiprocessing.mk
diff --git a/lang/python3/files/python3-package-ncurses.mk b/lang/python/python3/files/python3-package-ncurses.mk
similarity index 100%
rename from lang/python3/files/python3-package-ncurses.mk
rename to lang/python/python3/files/python3-package-ncurses.mk
diff --git a/lang/python3/files/python3-package-openssl.mk b/lang/python/python3/files/python3-package-openssl.mk
similarity index 100%
rename from lang/python3/files/python3-package-openssl.mk
rename to lang/python/python3/files/python3-package-openssl.mk
diff --git a/lang/python3/files/python3-package-pip.mk b/lang/python/python3/files/python3-package-pip.mk
similarity index 100%
rename from lang/python3/files/python3-package-pip.mk
rename to lang/python/python3/files/python3-package-pip.mk
diff --git a/lang/python3/files/python3-package-pydoc.mk b/lang/python/python3/files/python3-package-pydoc.mk
similarity index 100%
rename from lang/python3/files/python3-package-pydoc.mk
rename to lang/python/python3/files/python3-package-pydoc.mk
diff --git a/lang/python3/files/python3-package-setuptools.mk b/lang/python/python3/files/python3-package-setuptools.mk
similarity index 100%
rename from lang/python3/files/python3-package-setuptools.mk
rename to lang/python/python3/files/python3-package-setuptools.mk
diff --git a/lang/python3/files/python3-package-sqlite3.mk b/lang/python/python3/files/python3-package-sqlite3.mk
similarity index 100%
rename from lang/python3/files/python3-package-sqlite3.mk
rename to lang/python/python3/files/python3-package-sqlite3.mk
diff --git a/lang/python3/files/python3-package-unittest.mk b/lang/python/python3/files/python3-package-unittest.mk
similarity index 100%
rename from lang/python3/files/python3-package-unittest.mk
rename to lang/python/python3/files/python3-package-unittest.mk
diff --git a/lang/python3/files/python3-package-xml.mk b/lang/python/python3/files/python3-package-xml.mk
similarity index 100%
rename from lang/python3/files/python3-package-xml.mk
rename to lang/python/python3/files/python3-package-xml.mk
diff --git a/lang/python3/files/python3-package.mk b/lang/python/python3/files/python3-package.mk
similarity index 100%
rename from lang/python3/files/python3-package.mk
rename to lang/python/python3/files/python3-package.mk
diff --git a/lang/python3/files/python3-version.mk b/lang/python/python3/files/python3-version.mk
similarity index 100%
rename from lang/python3/files/python3-version.mk
rename to lang/python/python3/files/python3-version.mk
diff --git a/lang/python3/patches/001-enable-zlib.patch b/lang/python/python3/patches/001-enable-zlib.patch
similarity index 100%
rename from lang/python3/patches/001-enable-zlib.patch
rename to lang/python/python3/patches/001-enable-zlib.patch
diff --git a/lang/python3/patches/003-do-not-run-distutils-tests.patch b/lang/python/python3/patches/003-do-not-run-distutils-tests.patch
similarity index 100%
rename from lang/python3/patches/003-do-not-run-distutils-tests.patch
rename to lang/python/python3/patches/003-do-not-run-distutils-tests.patch
diff --git a/lang/python3/patches/004-do-not-write-bytes-codes.patch b/lang/python/python3/patches/004-do-not-write-bytes-codes.patch
similarity index 100%
rename from lang/python3/patches/004-do-not-write-bytes-codes.patch
rename to lang/python/python3/patches/004-do-not-write-bytes-codes.patch
diff --git a/lang/python3/patches/006-remove-debian-multiarch-support.patch b/lang/python/python3/patches/006-remove-debian-multiarch-support.patch
similarity index 100%
rename from lang/python3/patches/006-remove-debian-multiarch-support.patch
rename to lang/python/python3/patches/006-remove-debian-multiarch-support.patch
diff --git a/lang/python3/patches/007-distutils-do-not-adjust-path.patch b/lang/python/python3/patches/007-distutils-do-not-adjust-path.patch
similarity index 100%
rename from lang/python3/patches/007-distutils-do-not-adjust-path.patch
rename to lang/python/python3/patches/007-distutils-do-not-adjust-path.patch
diff --git a/lang/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch b/lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
similarity index 100%
rename from lang/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
rename to lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
diff --git a/lang/python3/patches/011-fix-ncursesw-definition-colisions.patch b/lang/python/python3/patches/011-fix-ncursesw-definition-colisions.patch
similarity index 100%
rename from lang/python3/patches/011-fix-ncursesw-definition-colisions.patch
rename to lang/python/python3/patches/011-fix-ncursesw-definition-colisions.patch
diff --git a/lang/python3/patches/012-disable-wcsftime-detection.patch b/lang/python/python3/patches/012-disable-wcsftime-detection.patch
similarity index 100%
rename from lang/python3/patches/012-disable-wcsftime-detection.patch
rename to lang/python/python3/patches/012-disable-wcsftime-detection.patch
diff --git a/lang/python3/patches/014-remove-platform-so-suffix.patch b/lang/python/python3/patches/014-remove-platform-so-suffix.patch
similarity index 100%
rename from lang/python3/patches/014-remove-platform-so-suffix.patch
rename to lang/python/python3/patches/014-remove-platform-so-suffix.patch
diff --git a/lang/python3/patches/015-abort-on-failed-modules.patch b/lang/python/python3/patches/015-abort-on-failed-modules.patch
similarity index 100%
rename from lang/python3/patches/015-abort-on-failed-modules.patch
rename to lang/python/python3/patches/015-abort-on-failed-modules.patch
diff --git a/lang/python3/patches/016-adjust-config-paths.patch b/lang/python/python3/patches/016-adjust-config-paths.patch
similarity index 100%
rename from lang/python3/patches/016-adjust-config-paths.patch
rename to lang/python/python3/patches/016-adjust-config-paths.patch
diff --git a/lang/pytz/Makefile b/lang/python/pytz/Makefile
similarity index 100%
rename from lang/pytz/Makefile
rename to lang/python/pytz/Makefile
diff --git a/lang/rcssmin/Makefile b/lang/python/rcssmin/Makefile
similarity index 100%
rename from lang/rcssmin/Makefile
rename to lang/python/rcssmin/Makefile
diff --git a/lang/simplejson/Makefile b/lang/python/simplejson/Makefile
similarity index 100%
rename from lang/simplejson/Makefile
rename to lang/python/simplejson/Makefile
diff --git a/lang/twisted/Makefile b/lang/python/twisted/Makefile
similarity index 100%
rename from lang/twisted/Makefile
rename to lang/python/twisted/Makefile
diff --git a/lang/twisted/patches/001-fix-zsh-completion.patch b/lang/python/twisted/patches/001-fix-zsh-completion.patch
similarity index 100%
rename from lang/twisted/patches/001-fix-zsh-completion.patch
rename to lang/python/twisted/patches/001-fix-zsh-completion.patch
diff --git a/lang/twisted/patches/002-omit-tests.patch b/lang/python/twisted/patches/002-omit-tests.patch
similarity index 100%
rename from lang/twisted/patches/002-omit-tests.patch
rename to lang/python/twisted/patches/002-omit-tests.patch
diff --git a/lang/zope-interface/Makefile b/lang/python/zope-interface/Makefile
similarity index 100%
rename from lang/zope-interface/Makefile
rename to lang/python/zope-interface/Makefile