diff --git a/setup.py b/setup.py
index 364a84a..f838e84 100644
--- a/setup.py
+++ b/setup.py
@@ -16,10 +16,12 @@ setup(name="magic-wormhole",
       packages=["wormhole",
                 "wormhole.blocking", "wormhole.twisted",
                 "wormhole.scripts", "wormhole.test", "wormhole.util",
-                "wormhole.servers"],
+                "wormhole_server"],
       package_data={"wormhole": ["db-schemas/*.sql"]},
       entry_points={"console_scripts":
-                    ["wormhole = wormhole.scripts.runner:entry"]},
+                    ["wormhole = wormhole.scripts.runner:entry",
+                     "wormhole-server = wormhole_server.runner:entry",
+                     ]},
       install_requires=["spake2==0.3", "pynacl", "requests", "argparse",
                         "six", "twisted >= 16.1.0"],
       extras_require={"tor": ["txtorcon", "ipaddr"]},
diff --git a/src/wormhole/servers/__init__.py b/src/wormhole_server/__init__.py
similarity index 100%
rename from src/wormhole/servers/__init__.py
rename to src/wormhole_server/__init__.py
diff --git a/src/wormhole/servers/cmd_server.py b/src/wormhole_server/cmd_server.py
similarity index 100%
rename from src/wormhole/servers/cmd_server.py
rename to src/wormhole_server/cmd_server.py
diff --git a/src/wormhole/servers/cmd_usage.py b/src/wormhole_server/cmd_usage.py
similarity index 100%
rename from src/wormhole/servers/cmd_usage.py
rename to src/wormhole_server/cmd_usage.py
diff --git a/src/wormhole/database.py b/src/wormhole_server/database.py
similarity index 100%
rename from src/wormhole/database.py
rename to src/wormhole_server/database.py
diff --git a/src/wormhole/db-schemas/v1.sql b/src/wormhole_server/db-schemas/v1.sql
similarity index 100%
rename from src/wormhole/db-schemas/v1.sql
rename to src/wormhole_server/db-schemas/v1.sql
diff --git a/src/wormhole/util/endpoint_service.py b/src/wormhole_server/endpoint_service.py
similarity index 100%
rename from src/wormhole/util/endpoint_service.py
rename to src/wormhole_server/endpoint_service.py
diff --git a/src/wormhole/servers/relay_server.py b/src/wormhole_server/relay_server.py
similarity index 100%
rename from src/wormhole/servers/relay_server.py
rename to src/wormhole_server/relay_server.py
diff --git a/src/wormhole/servers/server.py b/src/wormhole_server/server.py
similarity index 100%
rename from src/wormhole/servers/server.py
rename to src/wormhole_server/server.py
diff --git a/src/wormhole/servers/transit_server.py b/src/wormhole_server/transit_server.py
similarity index 100%
rename from src/wormhole/servers/transit_server.py
rename to src/wormhole_server/transit_server.py