diff --git a/MANIFEST.in b/MANIFEST.in
index 71cb5a2..59f79a5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include LICENSE
 include README.rst
-include backports/_datetime_fromisoformat/timezone.h
-include backports/_datetime_fromisoformat/_datetimemodule.h
\ No newline at end of file
+include backports/datetime_fromisoformat/timezone.h
+include backports/datetime_fromisoformat/_datetimemodule.h
\ No newline at end of file
diff --git a/backports/_datetime_fromisoformat/_datetimemodule.c b/backports/datetime_fromisoformat/_datetimemodule.c
similarity index 100%
rename from backports/_datetime_fromisoformat/_datetimemodule.c
rename to backports/datetime_fromisoformat/_datetimemodule.c
diff --git a/backports/_datetime_fromisoformat/_datetimemodule.h b/backports/datetime_fromisoformat/_datetimemodule.h
similarity index 100%
rename from backports/_datetime_fromisoformat/_datetimemodule.h
rename to backports/datetime_fromisoformat/_datetimemodule.h
diff --git a/backports/_datetime_fromisoformat/module.c b/backports/datetime_fromisoformat/module.c
similarity index 100%
rename from backports/_datetime_fromisoformat/module.c
rename to backports/datetime_fromisoformat/module.c
diff --git a/backports/_datetime_fromisoformat/timezone.c b/backports/datetime_fromisoformat/timezone.c
similarity index 100%
rename from backports/_datetime_fromisoformat/timezone.c
rename to backports/datetime_fromisoformat/timezone.c
diff --git a/backports/_datetime_fromisoformat/timezone.h b/backports/datetime_fromisoformat/timezone.h
similarity index 100%
rename from backports/_datetime_fromisoformat/timezone.h
rename to backports/datetime_fromisoformat/timezone.h
diff --git a/setup.py b/setup.py
index 80566c2..e670204 100644
--- a/setup.py
+++ b/setup.py
@@ -16,12 +16,15 @@
     author="Michael Overmeyer",
     author_email="backports@movermeyer.com",
     url="https://github.com/movermeyer/backports.datetime_fromisoformat",
-    ext_package="backports",
-    ext_modules=[Extension("_datetime_fromisoformat", [
-        os.path.join("backports", "_datetime_fromisoformat", "module.c"), 
-        os.path.join("backports", "_datetime_fromisoformat", "_datetimemodule.c"),
-        os.path.join("backports", "_datetime_fromisoformat", "timezone.c")
+
+    packages=["backports", "backports.datetime_fromisoformat"],
+
+    ext_modules=[Extension("backports._datetime_fromisoformat", [
+        os.path.join("backports", "datetime_fromisoformat", "module.c"),
+        os.path.join("backports", "datetime_fromisoformat", "_datetimemodule.c"),
+        os.path.join("backports", "datetime_fromisoformat", "timezone.c")
     ])],
+
     test_suite='tests',
     tests_require=[
         'pytz'
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests.py b/tests/tests.py
similarity index 100%
rename from tests.py
rename to tests/tests.py