diff --git a/elasticsearch/connection.py b/elasticsearch/connection/__init__.py
similarity index 99%
rename from elasticsearch/connection.py
rename to elasticsearch/connection/__init__.py
index 6710a844..4d292be7 100644
--- a/elasticsearch/connection.py
+++ b/elasticsearch/connection/__init__.py
@@ -19,7 +19,7 @@ try:
 except ImportError:
     THRIFT_AVAILABLE = False
 
-from .exceptions import TransportError, HTTP_EXCEPTIONS, ConnectionError
+from ..exceptions import TransportError, HTTP_EXCEPTIONS, ConnectionError
 
 logger = logging.getLogger('elasticsearch')
 tracer = logging.getLogger('elasticsearch.trace')
diff --git a/elasticsearch/esthrift/Rest-remote b/elasticsearch/connection/esthrift/Rest-remote
similarity index 100%
rename from elasticsearch/esthrift/Rest-remote
rename to elasticsearch/connection/esthrift/Rest-remote
diff --git a/elasticsearch/esthrift/Rest.py b/elasticsearch/connection/esthrift/Rest.py
similarity index 100%
rename from elasticsearch/esthrift/Rest.py
rename to elasticsearch/connection/esthrift/Rest.py
diff --git a/elasticsearch/esthrift/__init__.py b/elasticsearch/connection/esthrift/__init__.py
similarity index 100%
rename from elasticsearch/esthrift/__init__.py
rename to elasticsearch/connection/esthrift/__init__.py
diff --git a/elasticsearch/esthrift/constants.py b/elasticsearch/connection/esthrift/constants.py
similarity index 100%
rename from elasticsearch/esthrift/constants.py
rename to elasticsearch/connection/esthrift/constants.py
diff --git a/elasticsearch/esthrift/ttypes.py b/elasticsearch/connection/esthrift/ttypes.py
similarity index 100%
rename from elasticsearch/esthrift/ttypes.py
rename to elasticsearch/connection/esthrift/ttypes.py