diff --git a/docs/index.rst b/docs/index.rst
index fa7b74f586bf1c78621c12cdd9728c573b1fe52d..d95e9f613f0951d40c8ae08743005e071320d591 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -57,7 +57,7 @@ Submit scripts and bindings to the `Gremlin Server`_::
 
 Generate and submit Gremlin traversals in native Python::
 
-    >>> from goblin.gremlin_python import process  # This will change when released
+    >>> from gremlin_python import process
 
 
     >>> connection = loop.run_until_complete(
diff --git a/goblin/app.py b/goblin/app.py
index 57404496ec846841dc99de1e6448c3e906252aca..c7b698c119840bf16d0f401d70685506582d17a6 100644
--- a/goblin/app.py
+++ b/goblin/app.py
@@ -20,7 +20,7 @@
 import collections
 import logging
 
-from goblin.gremlin_python import process
+from gremlin_python import process
 from goblin import driver, element, session
 
 
diff --git a/goblin/driver/graph.py b/goblin/driver/graph.py
index 7c41168f021d40f836943f5bd53be3981c072ae5..4d19a6d7c1808fe7bcaa14af22ae78f81ddde2f1 100644
--- a/goblin/driver/graph.py
+++ b/goblin/driver/graph.py
@@ -17,9 +17,9 @@
 
 """A temporary solution to allow integration with gremlin_python package."""
 
-from goblin.gremlin_python.process.graph_traversal import (
+from gremlin_python.process.graph_traversal import (
     GraphTraversalSource, GraphTraversal)
-from goblin.gremlin_python.process.traversal import (
+from gremlin_python.process.traversal import (
     TraversalStrategy, TraversalStrategies)
 
 
diff --git a/goblin/gremlin_python/__init__.py b/gremlin_python/__init__.py
similarity index 100%
rename from goblin/gremlin_python/__init__.py
rename to gremlin_python/__init__.py
diff --git a/goblin/gremlin_python/driver/__init__.py b/gremlin_python/driver/__init__.py
similarity index 100%
rename from goblin/gremlin_python/driver/__init__.py
rename to gremlin_python/driver/__init__.py
diff --git a/goblin/gremlin_python/driver/remote_connection.py b/gremlin_python/driver/remote_connection.py
similarity index 100%
rename from goblin/gremlin_python/driver/remote_connection.py
rename to gremlin_python/driver/remote_connection.py
diff --git a/goblin/gremlin_python/driver/rest_remote_connection.py b/gremlin_python/driver/rest_remote_connection.py
similarity index 96%
rename from goblin/gremlin_python/driver/rest_remote_connection.py
rename to gremlin_python/driver/rest_remote_connection.py
index b2034fd9e15988b53b52c76c610d47ea666e37f4..6d967f8268efeb7749209879d6ae86a5e9bbd1f3 100644
--- a/goblin/gremlin_python/driver/rest_remote_connection.py
+++ b/gremlin_python/driver/rest_remote_connection.py
@@ -19,7 +19,7 @@ under the License.
 import json
 import requests
 
-from goblin.gremlin_python.process.traversal import Traverser
+from gremlin_python.process.traversal import Traverser
 from .remote_connection import RemoteConnection
 
 __author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
diff --git a/goblin/gremlin_python/process/__init__.py b/gremlin_python/process/__init__.py
similarity index 100%
rename from goblin/gremlin_python/process/__init__.py
rename to gremlin_python/process/__init__.py
diff --git a/goblin/gremlin_python/process/graph_traversal.py b/gremlin_python/process/graph_traversal.py
similarity index 99%
rename from goblin/gremlin_python/process/graph_traversal.py
rename to gremlin_python/process/graph_traversal.py
index b5d6a1733912eb742a743c59dbab647c4ac34922..37f9deb66a251c8d75ab2e316501ff6755f184c9 100644
--- a/goblin/gremlin_python/process/graph_traversal.py
+++ b/gremlin_python/process/graph_traversal.py
@@ -19,7 +19,7 @@ under the License.
 from .traversal import RawExpression
 from .traversal import Traversal
 from .traversal import Bytecode
-from goblin.gremlin_python import statics
+from gremlin_python import statics
 
 class GraphTraversalSource(object):
   def __init__(self, graph, traversal_strategies, graph_traversal=None, bytecode=Bytecode()):
diff --git a/goblin/gremlin_python/process/groovy_translator.py b/gremlin_python/process/groovy_translator.py
similarity index 100%
rename from goblin/gremlin_python/process/groovy_translator.py
rename to gremlin_python/process/groovy_translator.py
diff --git a/goblin/gremlin_python/process/jython_translator.py b/gremlin_python/process/jython_translator.py
similarity index 100%
rename from goblin/gremlin_python/process/jython_translator.py
rename to gremlin_python/process/jython_translator.py
diff --git a/goblin/gremlin_python/process/traversal.py b/gremlin_python/process/traversal.py
similarity index 99%
rename from goblin/gremlin_python/process/traversal.py
rename to gremlin_python/process/traversal.py
index c37c440f16b43279d138c64bfccf6168fbdd80ab..7558151f79f9ca7d837bc11e0c650c810eb52a19 100644
--- a/goblin/gremlin_python/process/traversal.py
+++ b/gremlin_python/process/traversal.py
@@ -18,7 +18,7 @@ under the License.
 '''
 from abc import abstractmethod
 from aenum import Enum
-from goblin.gremlin_python import statics
+from gremlin_python import statics
 
 class Traversal(object):
     def __init__(self, graph, traversal_strategies, bytecode):
diff --git a/goblin/gremlin_python/statics.py b/gremlin_python/statics.py
similarity index 100%
rename from goblin/gremlin_python/statics.py
rename to gremlin_python/statics.py
diff --git a/goblin/gremlin_python/structure/__init__.py b/gremlin_python/structure/__init__.py
similarity index 100%
rename from goblin/gremlin_python/structure/__init__.py
rename to gremlin_python/structure/__init__.py
diff --git a/goblin/gremlin_python/structure/graph.py b/gremlin_python/structure/graph.py
similarity index 86%
rename from goblin/gremlin_python/structure/graph.py
rename to gremlin_python/structure/graph.py
index 82909f1b88c2400f23875c9f6fbcd48e3c0a49c6..60b22113b57b5ac40156ad0a4adaaeded39b6586 100644
--- a/goblin/gremlin_python/structure/graph.py
+++ b/gremlin_python/structure/graph.py
@@ -19,8 +19,8 @@ under the License.
 
 __author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
 
-from goblin.gremlin_python.process.graph_traversal import GraphTraversalSource
-from goblin.gremlin_python.process.traversal import TraversalStrategies
+from gremlin_python.process.graph_traversal import GraphTraversalSource
+from gremlin_python.process.traversal import TraversalStrategies
 
 
 class Graph(object):
diff --git a/goblin/gremlin_python/structure/remote_graph.py b/gremlin_python/structure/remote_graph.py
similarity index 92%
rename from goblin/gremlin_python/structure/remote_graph.py
rename to gremlin_python/structure/remote_graph.py
index 19125ea879c1a4414a95ede80f86b52b16328761..778895b24a4438477a328b383bedc900935eae5e 100644
--- a/goblin/gremlin_python/structure/remote_graph.py
+++ b/gremlin_python/structure/remote_graph.py
@@ -20,8 +20,8 @@ under the License.
 __author__ = 'Marko A. Rodriguez (http://markorodriguez.com)'
 
 from .graph import Graph
-from goblin.gremlin_python.process.traversal import TraversalStrategies
-from goblin.gremlin_python.process.traversal import TraversalStrategy
+from gremlin_python.process.traversal import TraversalStrategies
+from gremlin_python.process.traversal import TraversalStrategy
 
 
 class RemoteGraph(Graph):
diff --git a/setup.py b/setup.py
index 654cd0ade1441a7eff12d84d960071dda6594071..a00500665c04ad0a1c98d1ee1957f9f56c569ee8 100644
--- a/setup.py
+++ b/setup.py
@@ -9,9 +9,9 @@ setup(
     author="davebshow",
     author_email="davebshow@gmail.com",
     description="Python toolkit for TP3 Gremlin Server",
-    packages=["goblin", "goblin.gremlin_python", "goblin.gremlin_python.process",
-              "goblin.gremlin_python.driver", "goblin.gremlin_python.structure",
-              "goblin.driver", "tests"],
+    packages=["goblin", "goblin.driver", "gremlin_python",
+              "gremlin_python.process", "gremlin_python.driver",
+              "gremlin_python.structure", "tests"],
     install_requires=[
         "aenum==1.4.5",
         "aiohttp==0.21.6",
diff --git a/tests/conftest.py b/tests/conftest.py
index 5e77cdf4097bd612cd499959fc2fbb02bfde929f..3775dd98a0234073c8406bd1b9b2bed695da2cc0 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -17,7 +17,7 @@
 
 import pytest
 from goblin import create_app, driver, element, properties
-from goblin.gremlin_python import process
+from gremlin_python import process
 
 
 class Person(element.Vertex):
diff --git a/tests/test_app.py b/tests/test_app.py
index 14223cf933ea88a2c772c633e4d24e021aa577fd..cf2e11d9747a292a8faf953e410f95a512a13bf4 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -16,7 +16,7 @@
 # along with Goblin.  If not, see <http://www.gnu.org/licenses/>.
 
 from goblin import element
-from goblin.gremlin_python import process
+from gremlin_python import process
 
 
 def test_registry(app, person, place, knows, lives_in):
diff --git a/tests/test_graph.py b/tests/test_graph.py
index 81e7ac72942625c00eba879e3ec2f6893c802e58..415f6f9a37b887b8884b7d838400d268ab9d7322 100644
--- a/tests/test_graph.py
+++ b/tests/test_graph.py
@@ -17,7 +17,7 @@
 
 import pytest
 
-from goblin.gremlin_python import process
+from gremlin_python import process
 
 
 @pytest.mark.asyncio