diff --git a/oyster/__init__.py b/oyster/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/oyster/bin/__init__.py b/oyster/bin/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/oyster/daemon.py b/oyster/bin/daemon.py
similarity index 97%
rename from oyster/daemon.py
rename to oyster/bin/daemon.py
index 0417c72..d67e7ed 100644
--- a/oyster/daemon.py
+++ b/oyster/bin/daemon.py
@@ -2,7 +2,7 @@ import multiprocessing
 import time
 import urllib
 
-from client import Client
+from ..client import Client
 
 class UpdateProcess(multiprocessing.Process):
 
diff --git a/oyster/status.py b/oyster/bin/oyster.py
similarity index 84%
rename from oyster/status.py
rename to oyster/bin/oyster.py
index 3ecb14a..70faa94 100644
--- a/oyster/status.py
+++ b/oyster/bin/oyster.py
@@ -1,4 +1,4 @@
-from client import Client
+from ..client import Client
 
 if __name__ == '__main__':
     c = Client()