diff --git a/segpy-ext/segpy-numpy/DESCRIPTION.rst b/segpy-ext/segpy_numpy/DESCRIPTION.rst
similarity index 100%
rename from segpy-ext/segpy-numpy/DESCRIPTION.rst
rename to segpy-ext/segpy_numpy/DESCRIPTION.rst
diff --git a/segpy-ext/segpy-numpy/examples/extract_trace_header_field.py b/segpy-ext/segpy_numpy/examples/extract_trace_header_field.py
similarity index 100%
rename from segpy-ext/segpy-numpy/examples/extract_trace_header_field.py
rename to segpy-ext/segpy_numpy/examples/extract_trace_header_field.py
diff --git a/segpy-ext/segpy-numpy/examples/inline.py b/segpy-ext/segpy_numpy/examples/inline.py
similarity index 100%
rename from segpy-ext/segpy-numpy/examples/inline.py
rename to segpy-ext/segpy_numpy/examples/inline.py
diff --git a/segpy-ext/segpy-numpy/segpy_numpy/__init__.py b/segpy-ext/segpy_numpy/segpy_numpy/__init__.py
similarity index 100%
rename from segpy-ext/segpy-numpy/segpy_numpy/__init__.py
rename to segpy-ext/segpy_numpy/segpy_numpy/__init__.py
diff --git a/segpy-ext/segpy-numpy/segpy_numpy/dtypes.py b/segpy-ext/segpy_numpy/segpy_numpy/dtypes.py
similarity index 100%
rename from segpy-ext/segpy-numpy/segpy_numpy/dtypes.py
rename to segpy-ext/segpy_numpy/segpy_numpy/dtypes.py
diff --git a/segpy-ext/segpy-numpy/segpy_numpy/extract.py b/segpy-ext/segpy_numpy/segpy_numpy/extract.py
similarity index 100%
rename from segpy-ext/segpy-numpy/segpy_numpy/extract.py
rename to segpy-ext/segpy_numpy/segpy_numpy/extract.py
diff --git a/segpy-ext/segpy-numpy/setup.cfg b/segpy-ext/segpy_numpy/setup.cfg
similarity index 100%
rename from segpy-ext/segpy-numpy/setup.cfg
rename to segpy-ext/segpy_numpy/setup.cfg
diff --git a/segpy-ext/segpy-numpy/setup.py b/segpy-ext/segpy_numpy/setup.py
similarity index 92%
rename from segpy-ext/segpy-numpy/setup.py
rename to segpy-ext/segpy_numpy/setup.py
index c604eaf..accc17e 100644
--- a/segpy-ext/segpy-numpy/setup.py
+++ b/segpy-ext/segpy_numpy/setup.py
@@ -36,7 +36,7 @@ with open(local_file('DESCRIPTION.rst'), encoding='utf-8') as f:
     long_description = f.read()
 
 setup(
-    name='segpy-numpy',
+    name='segpy_numpy',
 
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
@@ -47,14 +47,14 @@ setup(
     long_description=long_description,
 
     # The project's main homepage.
-    url='https://github.com/rob-smallshire/segpy',
+    url='https://github.com/sixty-north/segpy',
 
     # Author details
-    author='Robert Smallshire',
-    author_email='robert@smallshire.org.uk',
+    author='Sixty North AS',
+    author_email='rob@sixty-north.com',
 
     # Choose your license
-    license='GPL',
+    license='GNU Affero General Public License v3',
 
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
@@ -74,8 +74,7 @@ setup(
 
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
     ],
@@ -120,7 +119,8 @@ setup(
 
     # Declare entry-points to modules.
     entry_points={
-        'segpy.ext': 'segpy-numpy = segpy_numpy'
+        'console_scripts': [
+        ]
     },
 )
 
diff --git a/segpy-ext/segpy-numpy/test/__init__.py b/segpy-ext/segpy_numpy/test/__init__.py
similarity index 100%
rename from segpy-ext/segpy-numpy/test/__init__.py
rename to segpy-ext/segpy_numpy/test/__init__.py
diff --git a/segpy-ext/segpy-numpy/test/test_extract.py b/segpy-ext/segpy_numpy/test/test_extract.py
similarity index 100%
rename from segpy-ext/segpy-numpy/test/test_extract.py
rename to segpy-ext/segpy_numpy/test/test_extract.py