diff --git a/uplink b/bin/uplink
similarity index 99%
rename from uplink
rename to bin/uplink
index c16cb30..f87b47e 100755
--- a/uplink
+++ b/bin/uplink
@@ -28,7 +28,7 @@ import os
 import sys
 import time
 
-from uplink import Uplink
+from uplink.uplink import Uplink
 
 # Version format: MAJOR.FEATURE.FIXES
 __version__ = "0.6.1"
diff --git a/uplink/__init__.py b/uplink/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/daemon.py b/uplink/daemon.py
similarity index 100%
rename from daemon.py
rename to uplink/daemon.py
diff --git a/uplink.py b/uplink/uplink.py
similarity index 99%
rename from uplink.py
rename to uplink/uplink.py
index 736c481..9649051 100644
--- a/uplink.py
+++ b/uplink/uplink.py
@@ -25,7 +25,7 @@ import socket
 import sys
 import time
 
-from daemon import Daemon
+from uplink.daemon import Daemon
 from fritzconnection.lib.fritzstatus import FritzStatus
 from logging import getLogger
 from threading import Thread