diff --git a/pvcd.conf.sample b/daemon/pvcd.conf.sample
similarity index 100%
rename from pvcd.conf.sample
rename to daemon/pvcd.conf.sample
diff --git a/pvcd.py b/daemon/pvcd.py
similarity index 100%
rename from pvcd.py
rename to daemon/pvcd.py
diff --git a/pvcd.service b/daemon/pvcd.service
similarity index 100%
rename from pvcd.service
rename to daemon/pvcd.service
diff --git a/pvcd/Daemon.py b/daemon/pvcd/Daemon.py
similarity index 100%
rename from pvcd/Daemon.py
rename to daemon/pvcd/Daemon.py
diff --git a/pvcd/NodeInstance.py b/daemon/pvcd/NodeInstance.py
similarity index 100%
rename from pvcd/NodeInstance.py
rename to daemon/pvcd/NodeInstance.py
diff --git a/pvcd/VMInstance.py b/daemon/pvcd/VMInstance.py
similarity index 100%
rename from pvcd/VMInstance.py
rename to daemon/pvcd/VMInstance.py
diff --git a/pvcd/__init__.py b/daemon/pvcd/__init__.py
similarity index 100%
rename from pvcd/__init__.py
rename to daemon/pvcd/__init__.py
diff --git a/pvcd/ansiiprint.py b/daemon/pvcd/ansiiprint.py
similarity index 100%
rename from pvcd/ansiiprint.py
rename to daemon/pvcd/ansiiprint.py
diff --git a/pvcd/zkhandler.py b/daemon/pvcd/zkhandler.py
similarity index 100%
rename from pvcd/zkhandler.py
rename to daemon/pvcd/zkhandler.py
diff --git a/debian/pvc-daemon.install b/debian/pvc-daemon.install
index 25d67a6e..e5caba32 100644
--- a/debian/pvc-daemon.install
+++ b/debian/pvc-daemon.install
@@ -1,4 +1,4 @@
-pvcd.py usr/share/pvc
-pvcd.service lib/systemd/system
-pvcd.conf.sample etc/pvc
-pvcd usr/share/pvc
+daemon/pvcd.py usr/share/pvc
+daemon/pvcd.service lib/systemd/system
+daemon/pvcd.conf.sample etc/pvc
+daemon/pvcd usr/share/pvc
diff --git a/debian/pvc-daemon.prerm b/debian/pvc-daemon.prerm
index 63691d01..c71ce66b 100644
--- a/debian/pvc-daemon.prerm
+++ b/debian/pvc-daemon.prerm
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-# Disable the servive
+# Disable the service
 systemctl disable pvcd.service