diff --git a/lib/nc_time_axis/__init__.py b/nc_time_axis/__init__.py
similarity index 100%
rename from lib/nc_time_axis/__init__.py
rename to nc_time_axis/__init__.py
diff --git a/lib/nc_time_axis/_version.py b/nc_time_axis/_version.py
similarity index 100%
rename from lib/nc_time_axis/_version.py
rename to nc_time_axis/_version.py
diff --git a/lib/nc_time_axis/tests/__init__.py b/nc_time_axis/tests/__init__.py
similarity index 100%
rename from lib/nc_time_axis/tests/__init__.py
rename to nc_time_axis/tests/__init__.py
diff --git a/lib/nc_time_axis/tests/unit/__init__.py b/nc_time_axis/tests/unit/__init__.py
similarity index 100%
rename from lib/nc_time_axis/tests/unit/__init__.py
rename to nc_time_axis/tests/unit/__init__.py
diff --git a/lib/nc_time_axis/tests/unit/test_NetCDFTimeConverter.py b/nc_time_axis/tests/unit/test_NetCDFTimeConverter.py
similarity index 100%
rename from lib/nc_time_axis/tests/unit/test_NetCDFTimeConverter.py
rename to nc_time_axis/tests/unit/test_NetCDFTimeConverter.py
diff --git a/lib/nc_time_axis/tests/unit/test_NetCDFTimeDateFormatter.py b/nc_time_axis/tests/unit/test_NetCDFTimeDateFormatter.py
similarity index 100%
rename from lib/nc_time_axis/tests/unit/test_NetCDFTimeDateFormatter.py
rename to nc_time_axis/tests/unit/test_NetCDFTimeDateFormatter.py
diff --git a/lib/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py b/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py
similarity index 100%
rename from lib/nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py
rename to nc_time_axis/tests/unit/test_NetCDFTimeDateLocator.py
diff --git a/setup.py b/setup.py
index c18f880..c70518e 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@
 packages = []
 for d, _, _ in os.walk(os.path.join(here, 'nc_time_axis')):
     if os.path.exists(os.path.join(d, '__init__.py')):
-        packages.append(d[len(here)+2:].replace(os.path.sep, '.'))
+        packages.append(d[len(here)+1:].replace(os.path.sep, '.'))
 
 setup_args = dict(
     name='nc-time-axis',