diff --git a/agent b/agent
index 0738e3b..28b5150 100755
--- a/agent
+++ b/agent
@@ -1,2 +1,2 @@
 #!/bin/bash
-python __main__.py $*
+python -m sshagent.trezor_agent $*
diff --git a/sshagent/__init__.py b/sshagent/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/protocol.py b/sshagent/protocol.py
similarity index 100%
rename from protocol.py
rename to sshagent/protocol.py
diff --git a/agent.py b/sshagent/server.py
similarity index 100%
rename from agent.py
rename to sshagent/server.py
diff --git a/trezor.py b/sshagent/trezor.py
similarity index 100%
rename from trezor.py
rename to sshagent/trezor.py
diff --git a/__main__.py b/sshagent/trezor_agent.py
similarity index 92%
rename from __main__.py
rename to sshagent/trezor_agent.py
index 91ec55d..2667f89 100644
--- a/__main__.py
+++ b/sshagent/trezor_agent.py
@@ -4,7 +4,7 @@ import logging
 log = logging.getLogger(__name__)
 
 import trezor
-import agent
+import server
 
 def main():
     fmt = '%(asctime)s %(levelname)-12s %(message)-100s [%(filename)s]'
@@ -33,7 +33,7 @@ def main():
     signer = client.sign_ssh_challenge
 
     try:
-        agent.serve(key_files=key_files, command=args.command, signer=signer)
+        server.serve(key_files=key_files, command=args.command, signer=signer)
     except KeyboardInterrupt:
         log.info('server stopped')
     except Exception as e: