diff --git a/run b/run
new file mode 100755
index 0000000..54db9b8
--- /dev/null
+++ b/run
@@ -0,0 +1,5 @@
+#!/usr/bin/python
+
+import websockify
+
+websockify.websocketproxy.websockify_init()
diff --git a/setup.py b/setup.py
index 642dbc4..947f0a5 100644
--- a/setup.py
+++ b/setup.py
@@ -18,13 +18,13 @@ setup(name=name,
       author="Joel Martin",
       author_email="github@martintribe.org",
 
-      packages=find_packages(),
+      packages=['websockify'],
       include_package_data=True,
       install_requires=['numpy'],
       zip_safe=False,
       entry_points={
         'console_scripts': [
-          'websockify = websockify:websockify_init',
+            'websockify = websockify.websocketproxy:websockify_init',
         ]
       },
     )
diff --git a/websockify.py b/websockify.py
index 05b5af4..e5224d5 120000
--- a/websockify.py
+++ b/websockify.py
@@ -1 +1 @@
-websockify
\ No newline at end of file
+run
\ No newline at end of file
diff --git a/websockify/__init__.py b/websockify/__init__.py
new file mode 100644
index 0000000..9e75803
--- /dev/null
+++ b/websockify/__init__.py
@@ -0,0 +1 @@
+import websocket, websocketproxy
diff --git a/websocket.py b/websockify/websocket.py
similarity index 100%
rename from websocket.py
rename to websockify/websocket.py
diff --git a/websockify b/websockify/websocketproxy.py
similarity index 100%
rename from websockify
rename to websockify/websocketproxy.py