diff --git a/lang/Makefile.am b/lang/Makefile.am
index 29446ebf..8eb461d8 100644
--- a/lang/Makefile.am
+++ b/lang/Makefile.am
@@ -17,6 +17,6 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-SUBDIRS = cl, py3-pyme
+SUBDIRS = cl python
 
 EXTRA_DIST = README
diff --git a/lang/py3-pyme/COPYING b/lang/python/COPYING
similarity index 100%
rename from lang/py3-pyme/COPYING
rename to lang/python/COPYING
diff --git a/lang/py3-pyme/COPYING.LESSER b/lang/python/COPYING.LESSER
similarity index 100%
rename from lang/py3-pyme/COPYING.LESSER
rename to lang/python/COPYING.LESSER
diff --git a/lang/py3-pyme/INSTALL b/lang/python/INSTALL
similarity index 100%
rename from lang/py3-pyme/INSTALL
rename to lang/python/INSTALL
diff --git a/lang/py3-pyme/MANIFEST.in b/lang/python/MANIFEST.in
similarity index 100%
rename from lang/py3-pyme/MANIFEST.in
rename to lang/python/MANIFEST.in
diff --git a/lang/py3-pyme/README.rst b/lang/python/README.rst
similarity index 100%
rename from lang/py3-pyme/README.rst
rename to lang/python/README.rst
diff --git a/lang/py3-pyme/debian/README.Debian b/lang/python/debian/README.Debian
similarity index 100%
rename from lang/py3-pyme/debian/README.Debian
rename to lang/python/debian/README.Debian
diff --git a/lang/py3-pyme/debian/changelog b/lang/python/debian/changelog
similarity index 100%
rename from lang/py3-pyme/debian/changelog
rename to lang/python/debian/changelog
diff --git a/lang/py3-pyme/debian/control b/lang/python/debian/control
similarity index 100%
rename from lang/py3-pyme/debian/control
rename to lang/python/debian/control
diff --git a/lang/py3-pyme/debian/copyright b/lang/python/debian/copyright
similarity index 100%
rename from lang/py3-pyme/debian/copyright
rename to lang/python/debian/copyright
diff --git a/lang/py3-pyme/debian/docs b/lang/python/debian/docs
similarity index 100%
rename from lang/py3-pyme/debian/docs
rename to lang/python/debian/docs
diff --git a/lang/py3-pyme/debian/examples b/lang/python/debian/examples
similarity index 100%
rename from lang/py3-pyme/debian/examples
rename to lang/python/debian/examples
diff --git a/lang/py3-pyme/debian/rules b/lang/python/debian/rules
similarity index 100%
rename from lang/py3-pyme/debian/rules
rename to lang/python/debian/rules
diff --git a/lang/py3-pyme/docs/Short_History.rst b/lang/python/docs/Short_History.rst
similarity index 100%
rename from lang/py3-pyme/docs/Short_History.rst
rename to lang/python/docs/Short_History.rst
diff --git a/lang/py3-pyme/docs/TODO.rst b/lang/python/docs/TODO.rst
similarity index 100%
rename from lang/py3-pyme/docs/TODO.rst
rename to lang/python/docs/TODO.rst
diff --git a/lang/py3-pyme/docs/old-commits.log b/lang/python/docs/old-commits.log
similarity index 100%
rename from lang/py3-pyme/docs/old-commits.log
rename to lang/python/docs/old-commits.log
diff --git a/lang/py3-pyme/examples/Examples.rst b/lang/python/examples/Examples.rst
similarity index 100%
rename from lang/py3-pyme/examples/Examples.rst
rename to lang/python/examples/Examples.rst
diff --git a/lang/py3-pyme/examples/delkey.py b/lang/python/examples/delkey.py
similarity index 100%
rename from lang/py3-pyme/examples/delkey.py
rename to lang/python/examples/delkey.py
diff --git a/lang/py3-pyme/examples/encrypt-to-all.py b/lang/python/examples/encrypt-to-all.py
similarity index 100%
rename from lang/py3-pyme/examples/encrypt-to-all.py
rename to lang/python/examples/encrypt-to-all.py
diff --git a/lang/py3-pyme/examples/exportimport.py b/lang/python/examples/exportimport.py
similarity index 100%
rename from lang/py3-pyme/examples/exportimport.py
rename to lang/python/examples/exportimport.py
diff --git a/lang/py3-pyme/examples/genkey.py b/lang/python/examples/genkey.py
similarity index 100%
rename from lang/py3-pyme/examples/genkey.py
rename to lang/python/examples/genkey.py
diff --git a/lang/py3-pyme/examples/inter-edit.py b/lang/python/examples/inter-edit.py
similarity index 100%
rename from lang/py3-pyme/examples/inter-edit.py
rename to lang/python/examples/inter-edit.py
diff --git a/lang/py3-pyme/examples/sign.py b/lang/python/examples/sign.py
similarity index 100%
rename from lang/py3-pyme/examples/sign.py
rename to lang/python/examples/sign.py
diff --git a/lang/py3-pyme/examples/signverify.py b/lang/python/examples/signverify.py
similarity index 100%
rename from lang/py3-pyme/examples/signverify.py
rename to lang/python/examples/signverify.py
diff --git a/lang/py3-pyme/examples/simple.py b/lang/python/examples/simple.py
similarity index 100%
rename from lang/py3-pyme/examples/simple.py
rename to lang/python/examples/simple.py
diff --git a/lang/py3-pyme/examples/t-edit.py b/lang/python/examples/t-edit.py
similarity index 100%
rename from lang/py3-pyme/examples/t-edit.py
rename to lang/python/examples/t-edit.py
diff --git a/lang/py3-pyme/examples/testCMSgetkey.py b/lang/python/examples/testCMSgetkey.py
similarity index 100%
rename from lang/py3-pyme/examples/testCMSgetkey.py
rename to lang/python/examples/testCMSgetkey.py
diff --git a/lang/py3-pyme/examples/verifydetails.py b/lang/python/examples/verifydetails.py
similarity index 100%
rename from lang/py3-pyme/examples/verifydetails.py
rename to lang/python/examples/verifydetails.py
diff --git a/lang/py3-pyme/gpgme-h-clean.py b/lang/python/gpgme-h-clean.py
similarity index 100%
rename from lang/py3-pyme/gpgme-h-clean.py
rename to lang/python/gpgme-h-clean.py
diff --git a/lang/py3-pyme/gpgme.i b/lang/python/gpgme.i
similarity index 100%
rename from lang/py3-pyme/gpgme.i
rename to lang/python/gpgme.i
diff --git a/lang/py3-pyme/helpers.c b/lang/python/helpers.c
similarity index 100%
rename from lang/py3-pyme/helpers.c
rename to lang/python/helpers.c
diff --git a/lang/py3-pyme/helpers.h b/lang/python/helpers.h
similarity index 100%
rename from lang/py3-pyme/helpers.h
rename to lang/python/helpers.h
diff --git a/lang/py3-pyme/pyme/__init__.py b/lang/python/pyme/__init__.py
similarity index 100%
rename from lang/py3-pyme/pyme/__init__.py
rename to lang/python/pyme/__init__.py
diff --git a/lang/py3-pyme/pyme/callbacks.py b/lang/python/pyme/callbacks.py
similarity index 100%
rename from lang/py3-pyme/pyme/callbacks.py
rename to lang/python/pyme/callbacks.py
diff --git a/lang/py3-pyme/pyme/constants/__init__.py b/lang/python/pyme/constants/__init__.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/__init__.py
rename to lang/python/pyme/constants/__init__.py
diff --git a/lang/py3-pyme/pyme/constants/data/__init__.py b/lang/python/pyme/constants/data/__init__.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/data/__init__.py
rename to lang/python/pyme/constants/data/__init__.py
diff --git a/lang/py3-pyme/pyme/constants/data/encoding.py b/lang/python/pyme/constants/data/encoding.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/data/encoding.py
rename to lang/python/pyme/constants/data/encoding.py
diff --git a/lang/py3-pyme/pyme/constants/event.py b/lang/python/pyme/constants/event.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/event.py
rename to lang/python/pyme/constants/event.py
diff --git a/lang/py3-pyme/pyme/constants/import.py b/lang/python/pyme/constants/import.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/import.py
rename to lang/python/pyme/constants/import.py
diff --git a/lang/py3-pyme/pyme/constants/keylist/__init__.py b/lang/python/pyme/constants/keylist/__init__.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/keylist/__init__.py
rename to lang/python/pyme/constants/keylist/__init__.py
diff --git a/lang/py3-pyme/pyme/constants/keylist/mode.py b/lang/python/pyme/constants/keylist/mode.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/keylist/mode.py
rename to lang/python/pyme/constants/keylist/mode.py
diff --git a/lang/py3-pyme/pyme/constants/md.py b/lang/python/pyme/constants/md.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/md.py
rename to lang/python/pyme/constants/md.py
diff --git a/lang/py3-pyme/pyme/constants/pk.py b/lang/python/pyme/constants/pk.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/pk.py
rename to lang/python/pyme/constants/pk.py
diff --git a/lang/py3-pyme/pyme/constants/protocol.py b/lang/python/pyme/constants/protocol.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/protocol.py
rename to lang/python/pyme/constants/protocol.py
diff --git a/lang/py3-pyme/pyme/constants/sig/__init__.py b/lang/python/pyme/constants/sig/__init__.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/sig/__init__.py
rename to lang/python/pyme/constants/sig/__init__.py
diff --git a/lang/py3-pyme/pyme/constants/sig/mode.py b/lang/python/pyme/constants/sig/mode.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/sig/mode.py
rename to lang/python/pyme/constants/sig/mode.py
diff --git a/lang/py3-pyme/pyme/constants/sigsum.py b/lang/python/pyme/constants/sigsum.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/sigsum.py
rename to lang/python/pyme/constants/sigsum.py
diff --git a/lang/py3-pyme/pyme/constants/status.py b/lang/python/pyme/constants/status.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/status.py
rename to lang/python/pyme/constants/status.py
diff --git a/lang/py3-pyme/pyme/constants/validity.py b/lang/python/pyme/constants/validity.py
similarity index 100%
rename from lang/py3-pyme/pyme/constants/validity.py
rename to lang/python/pyme/constants/validity.py
diff --git a/lang/py3-pyme/pyme/core.py b/lang/python/pyme/core.py
similarity index 100%
rename from lang/py3-pyme/pyme/core.py
rename to lang/python/pyme/core.py
diff --git a/lang/py3-pyme/pyme/errors.py b/lang/python/pyme/errors.py
similarity index 100%
rename from lang/py3-pyme/pyme/errors.py
rename to lang/python/pyme/errors.py
diff --git a/lang/py3-pyme/pyme/util.py b/lang/python/pyme/util.py
similarity index 100%
rename from lang/py3-pyme/pyme/util.py
rename to lang/python/pyme/util.py
diff --git a/lang/py3-pyme/pyme/version.py b/lang/python/pyme/version.py
similarity index 100%
rename from lang/py3-pyme/pyme/version.py
rename to lang/python/pyme/version.py
diff --git a/lang/py3-pyme/setup.py b/lang/python/setup.py
similarity index 100%
rename from lang/py3-pyme/setup.py
rename to lang/python/setup.py