diff --git a/.gitignore b/.gitignore
index 1a9d961..4ad1a0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.pyc
 *.o
 *.so
+config.json
+tags
diff --git a/INSTALL b/INSTALL
index 289c5fe..fdaa31e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,6 +4,6 @@ Dependencies (Debian):
 
   # pip install tornado
 
-  $ cd gateway/txrad/
+  $ cd daemon/txrad/
   $ make
 
diff --git a/daemon/gateway.py b/daemon/gateway.py
index 96c075c..4c2d6ea 100755
--- a/daemon/gateway.py
+++ b/daemon/gateway.py
@@ -18,7 +18,7 @@
 from tornado.platform.twisted import TwistedIOLoop
 from twisted.internet import reactor
 TwistedIOLoop().install()
-from crypto2crypto import CryptoTransportLayer
+from lib.crypto2crypto import CryptoTransportLayer
 
 from tornado.options import define, options, parse_command_line
 
diff --git a/daemon/lib/__init__.py b/daemon/lib/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/lib/crypto2crypto.py b/daemon/lib/crypto2crypto.py
similarity index 100%
rename from lib/crypto2crypto.py
rename to daemon/lib/crypto2crypto.py
diff --git a/lib/p2p.py b/daemon/lib/p2p.py
similarity index 100%
rename from lib/p2p.py
rename to daemon/lib/p2p.py