diff --git a/libpip2pi/__init__.py b/pip2pi/__init__.py
similarity index 100%
rename from libpip2pi/__init__.py
rename to pip2pi/__init__.py
diff --git a/pip2pi/__main__.py b/pip2pi/__main__.py
new file mode 100644
index 0000000..e4d3f34
--- /dev/null
+++ b/pip2pi/__main__.py
@@ -0,0 +1,9 @@
+from __future__ import absolute_import
+
+import os
+import sys
+
+from pip2pi.commands import pip2pi
+
+if __name__ == '__main__':
+    sys.exit(pip2pi())
diff --git a/libpip2pi/commands.py b/pip2pi/commands.py
similarity index 100%
rename from libpip2pi/commands.py
rename to pip2pi/commands.py
diff --git a/setup.py b/setup.py
index 8929b3d..0eb2fcc 100644
--- a/setup.py
+++ b/setup.py
@@ -12,8 +12,8 @@
 except IOError:
     long_description = "See https://github.com/wolever/pip2pi"
 
-import libpip2pi
-version = ".".join(map(str, libpip2pi.__version__))
+import pip2pi
+version = ".".join(map(str, pip2pi.__version__))
 
 setup(
     name="pip2pi",
@@ -28,9 +28,9 @@
     packages=find_packages(),
     entry_points={
         'console_scripts': [
-            'dir2pi = libpip2pi.commands:dir2pi',
-            'pip2pi = libpip2pi.commands:pip2pi',
-            'pip2tgz = libpip2pi.commands:pip2tgz',
+            'dir2pi = pip2pi.commands:dir2pi',
+            'pip2pi = pip2pi.commands:pip2pi',
+            'pip2tgz = pip2pi.commands:pip2tgz',
         ],
     },
     install_requires=[
diff --git a/tests/test.py b/tests/test.py
index d7b8600..8339086 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -30,7 +30,7 @@
 PKG_BASE_PATH = os.path.join(os.path.abspath(os.path.dirname(__file__)), "../")
 sys.path.append(PKG_BASE_PATH)
 
-from libpip2pi import commands as pip2pi_commands
+from pip2pi import commands as pip2pi_commands
 
 class chdir(object):
     """ A drop-in replacement for ``os.chdir`` which also acts as a context