diff --git a/.rat-excludes b/.rat-excludes
index ba0b8f3cc..431327294 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -53,3 +53,4 @@ build/scala-*/**
 **/*.tokens
 **/BeeLine.properties
 **/sql-keywords.properties
+**/python/**
diff --git a/pyhive/LICENSE b/python/LICENSE
similarity index 100%
rename from pyhive/LICENSE
rename to python/LICENSE
diff --git a/pyhive/MANIFEST.in b/python/MANIFEST.in
similarity index 100%
rename from pyhive/MANIFEST.in
rename to python/MANIFEST.in
diff --git a/pyhive/README.rst b/python/README.rst
similarity index 100%
rename from pyhive/README.rst
rename to python/README.rst
diff --git a/pyhive/TCLIService/TCLIService-remote b/python/TCLIService/TCLIService-remote
similarity index 100%
rename from pyhive/TCLIService/TCLIService-remote
rename to python/TCLIService/TCLIService-remote
diff --git a/pyhive/TCLIService/TCLIService.py b/python/TCLIService/TCLIService.py
similarity index 100%
rename from pyhive/TCLIService/TCLIService.py
rename to python/TCLIService/TCLIService.py
diff --git a/pyhive/TCLIService/__init__.py b/python/TCLIService/__init__.py
similarity index 100%
rename from pyhive/TCLIService/__init__.py
rename to python/TCLIService/__init__.py
diff --git a/pyhive/TCLIService/constants.py b/python/TCLIService/constants.py
similarity index 100%
rename from pyhive/TCLIService/constants.py
rename to python/TCLIService/constants.py
diff --git a/pyhive/TCLIService/ttypes.py b/python/TCLIService/ttypes.py
similarity index 100%
rename from pyhive/TCLIService/ttypes.py
rename to python/TCLIService/ttypes.py
diff --git a/pyhive/dev_requirements.txt b/python/dev_requirements.txt
similarity index 100%
rename from pyhive/dev_requirements.txt
rename to python/dev_requirements.txt
diff --git a/pyhive/generate.py b/python/generate.py
similarity index 100%
rename from pyhive/generate.py
rename to python/generate.py
diff --git a/pyhive/pyhive/__init__.py b/python/pyhive/__init__.py
similarity index 100%
rename from pyhive/pyhive/__init__.py
rename to python/pyhive/__init__.py
diff --git a/pyhive/pyhive/common.py b/python/pyhive/common.py
similarity index 100%
rename from pyhive/pyhive/common.py
rename to python/pyhive/common.py
diff --git a/pyhive/pyhive/exc.py b/python/pyhive/exc.py
similarity index 100%
rename from pyhive/pyhive/exc.py
rename to python/pyhive/exc.py
diff --git a/pyhive/pyhive/hive.py b/python/pyhive/hive.py
similarity index 100%
rename from pyhive/pyhive/hive.py
rename to python/pyhive/hive.py
diff --git a/pyhive/pyhive/presto.py b/python/pyhive/presto.py
similarity index 100%
rename from pyhive/pyhive/presto.py
rename to python/pyhive/presto.py
diff --git a/pyhive/pyhive/sasl_compat.py b/python/pyhive/sasl_compat.py
similarity index 100%
rename from pyhive/pyhive/sasl_compat.py
rename to python/pyhive/sasl_compat.py
diff --git a/pyhive/pyhive/sqlalchemy_hive.py b/python/pyhive/sqlalchemy_hive.py
similarity index 100%
rename from pyhive/pyhive/sqlalchemy_hive.py
rename to python/pyhive/sqlalchemy_hive.py
diff --git a/pyhive/pyhive/sqlalchemy_presto.py b/python/pyhive/sqlalchemy_presto.py
similarity index 100%
rename from pyhive/pyhive/sqlalchemy_presto.py
rename to python/pyhive/sqlalchemy_presto.py
diff --git a/pyhive/pyhive/sqlalchemy_trino.py b/python/pyhive/sqlalchemy_trino.py
similarity index 100%
rename from pyhive/pyhive/sqlalchemy_trino.py
rename to python/pyhive/sqlalchemy_trino.py
diff --git a/pyhive/pyhive/tests/__init__.py b/python/pyhive/tests/__init__.py
similarity index 100%
rename from pyhive/pyhive/tests/__init__.py
rename to python/pyhive/tests/__init__.py
diff --git a/pyhive/pyhive/tests/dbapi_test_case.py b/python/pyhive/tests/dbapi_test_case.py
similarity index 100%
rename from pyhive/pyhive/tests/dbapi_test_case.py
rename to python/pyhive/tests/dbapi_test_case.py
diff --git a/pyhive/pyhive/tests/ldif_data/INITIAL_TESTDATA.ldif b/python/pyhive/tests/ldif_data/INITIAL_TESTDATA.ldif
similarity index 100%
rename from pyhive/pyhive/tests/ldif_data/INITIAL_TESTDATA.ldif
rename to python/pyhive/tests/ldif_data/INITIAL_TESTDATA.ldif
diff --git a/pyhive/pyhive/tests/ldif_data/base.ldif b/python/pyhive/tests/ldif_data/base.ldif
similarity index 100%
rename from pyhive/pyhive/tests/ldif_data/base.ldif
rename to python/pyhive/tests/ldif_data/base.ldif
diff --git a/pyhive/pyhive/tests/sqlalchemy_test_case.py b/python/pyhive/tests/sqlalchemy_test_case.py
similarity index 100%
rename from pyhive/pyhive/tests/sqlalchemy_test_case.py
rename to python/pyhive/tests/sqlalchemy_test_case.py
diff --git a/pyhive/pyhive/tests/test_common.py b/python/pyhive/tests/test_common.py
similarity index 100%
rename from pyhive/pyhive/tests/test_common.py
rename to python/pyhive/tests/test_common.py
diff --git a/pyhive/pyhive/tests/test_hive.py b/python/pyhive/tests/test_hive.py
similarity index 100%
rename from pyhive/pyhive/tests/test_hive.py
rename to python/pyhive/tests/test_hive.py
diff --git a/pyhive/pyhive/tests/test_presto.py b/python/pyhive/tests/test_presto.py
similarity index 100%
rename from pyhive/pyhive/tests/test_presto.py
rename to python/pyhive/tests/test_presto.py
diff --git a/pyhive/pyhive/tests/test_sasl_compat.py b/python/pyhive/tests/test_sasl_compat.py
similarity index 100%
rename from pyhive/pyhive/tests/test_sasl_compat.py
rename to python/pyhive/tests/test_sasl_compat.py
diff --git a/pyhive/pyhive/tests/test_sqlalchemy_hive.py b/python/pyhive/tests/test_sqlalchemy_hive.py
similarity index 100%
rename from pyhive/pyhive/tests/test_sqlalchemy_hive.py
rename to python/pyhive/tests/test_sqlalchemy_hive.py
diff --git a/pyhive/pyhive/tests/test_sqlalchemy_presto.py b/python/pyhive/tests/test_sqlalchemy_presto.py
similarity index 100%
rename from pyhive/pyhive/tests/test_sqlalchemy_presto.py
rename to python/pyhive/tests/test_sqlalchemy_presto.py
diff --git a/pyhive/pyhive/tests/test_sqlalchemy_trino.py b/python/pyhive/tests/test_sqlalchemy_trino.py
similarity index 100%
rename from pyhive/pyhive/tests/test_sqlalchemy_trino.py
rename to python/pyhive/tests/test_sqlalchemy_trino.py
diff --git a/pyhive/pyhive/tests/test_trino.py b/python/pyhive/tests/test_trino.py
similarity index 100%
rename from pyhive/pyhive/tests/test_trino.py
rename to python/pyhive/tests/test_trino.py
diff --git a/pyhive/pyhive/trino.py b/python/pyhive/trino.py
similarity index 100%
rename from pyhive/pyhive/trino.py
rename to python/pyhive/trino.py
diff --git a/pyhive/scripts/ldap_config/slapd.conf b/python/scripts/ldap_config/slapd.conf
similarity index 100%
rename from pyhive/scripts/ldap_config/slapd.conf
rename to python/scripts/ldap_config/slapd.conf
diff --git a/pyhive/scripts/make_many_rows.sh b/python/scripts/make_many_rows.sh
similarity index 100%
rename from pyhive/scripts/make_many_rows.sh
rename to python/scripts/make_many_rows.sh
diff --git a/pyhive/scripts/make_one_row.sh b/python/scripts/make_one_row.sh
similarity index 100%
rename from pyhive/scripts/make_one_row.sh
rename to python/scripts/make_one_row.sh
diff --git a/pyhive/scripts/make_one_row_complex.sh b/python/scripts/make_one_row_complex.sh
similarity index 100%
rename from pyhive/scripts/make_one_row_complex.sh
rename to python/scripts/make_one_row_complex.sh
diff --git a/pyhive/scripts/make_test_database.sh b/python/scripts/make_test_database.sh
similarity index 100%
rename from pyhive/scripts/make_test_database.sh
rename to python/scripts/make_test_database.sh
diff --git a/pyhive/scripts/make_test_tables.sh b/python/scripts/make_test_tables.sh
similarity index 100%
rename from pyhive/scripts/make_test_tables.sh
rename to python/scripts/make_test_tables.sh
diff --git a/pyhive/scripts/thrift-patches/TCLIService.patch b/python/scripts/thrift-patches/TCLIService.patch
similarity index 100%
rename from pyhive/scripts/thrift-patches/TCLIService.patch
rename to python/scripts/thrift-patches/TCLIService.patch
diff --git a/pyhive/scripts/travis-conf/com/dropbox/DummyPasswdAuthenticationProvider.java b/python/scripts/travis-conf/com/dropbox/DummyPasswdAuthenticationProvider.java
similarity index 100%
rename from pyhive/scripts/travis-conf/com/dropbox/DummyPasswdAuthenticationProvider.java
rename to python/scripts/travis-conf/com/dropbox/DummyPasswdAuthenticationProvider.java
diff --git a/pyhive/scripts/travis-conf/hive/hive-site-custom.xml b/python/scripts/travis-conf/hive/hive-site-custom.xml
similarity index 100%
rename from pyhive/scripts/travis-conf/hive/hive-site-custom.xml
rename to python/scripts/travis-conf/hive/hive-site-custom.xml
diff --git a/pyhive/scripts/travis-conf/hive/hive-site-ldap.xml b/python/scripts/travis-conf/hive/hive-site-ldap.xml
similarity index 100%
rename from pyhive/scripts/travis-conf/hive/hive-site-ldap.xml
rename to python/scripts/travis-conf/hive/hive-site-ldap.xml
diff --git a/pyhive/scripts/travis-conf/hive/hive-site.xml b/python/scripts/travis-conf/hive/hive-site.xml
similarity index 100%
rename from pyhive/scripts/travis-conf/hive/hive-site.xml
rename to python/scripts/travis-conf/hive/hive-site.xml
diff --git a/pyhive/scripts/travis-conf/presto/catalog/hive.properties b/python/scripts/travis-conf/presto/catalog/hive.properties
similarity index 100%
rename from pyhive/scripts/travis-conf/presto/catalog/hive.properties
rename to python/scripts/travis-conf/presto/catalog/hive.properties
diff --git a/pyhive/scripts/travis-conf/presto/config.properties b/python/scripts/travis-conf/presto/config.properties
similarity index 100%
rename from pyhive/scripts/travis-conf/presto/config.properties
rename to python/scripts/travis-conf/presto/config.properties
diff --git a/pyhive/scripts/travis-conf/presto/jvm.config b/python/scripts/travis-conf/presto/jvm.config
similarity index 100%
rename from pyhive/scripts/travis-conf/presto/jvm.config
rename to python/scripts/travis-conf/presto/jvm.config
diff --git a/pyhive/scripts/travis-conf/presto/node.properties b/python/scripts/travis-conf/presto/node.properties
similarity index 100%
rename from pyhive/scripts/travis-conf/presto/node.properties
rename to python/scripts/travis-conf/presto/node.properties
diff --git a/pyhive/scripts/travis-conf/trino/catalog/hive.properties b/python/scripts/travis-conf/trino/catalog/hive.properties
similarity index 100%
rename from pyhive/scripts/travis-conf/trino/catalog/hive.properties
rename to python/scripts/travis-conf/trino/catalog/hive.properties
diff --git a/pyhive/scripts/travis-conf/trino/config.properties b/python/scripts/travis-conf/trino/config.properties
similarity index 100%
rename from pyhive/scripts/travis-conf/trino/config.properties
rename to python/scripts/travis-conf/trino/config.properties
diff --git a/pyhive/scripts/travis-conf/trino/jvm.config b/python/scripts/travis-conf/trino/jvm.config
similarity index 100%
rename from pyhive/scripts/travis-conf/trino/jvm.config
rename to python/scripts/travis-conf/trino/jvm.config
diff --git a/pyhive/scripts/travis-conf/trino/node.properties b/python/scripts/travis-conf/trino/node.properties
similarity index 100%
rename from pyhive/scripts/travis-conf/trino/node.properties
rename to python/scripts/travis-conf/trino/node.properties
diff --git a/pyhive/scripts/travis-install.sh b/python/scripts/travis-install.sh
similarity index 100%
rename from pyhive/scripts/travis-install.sh
rename to python/scripts/travis-install.sh
diff --git a/pyhive/scripts/update_thrift_bindings.sh b/python/scripts/update_thrift_bindings.sh
similarity index 100%
rename from pyhive/scripts/update_thrift_bindings.sh
rename to python/scripts/update_thrift_bindings.sh
diff --git a/pyhive/setup.cfg b/python/setup.cfg
similarity index 100%
rename from pyhive/setup.cfg
rename to python/setup.cfg
diff --git a/pyhive/setup.py b/python/setup.py
similarity index 100%
rename from pyhive/setup.py
rename to python/setup.py