diff --git a/etc/systemd/system/README.md b/etc/systemd/system/README.md
index bdc30212..7d15b68b 100644
--- a/etc/systemd/system/README.md
+++ b/etc/systemd/system/README.md
@@ -1,3 +1,5 @@
+Subdirectories of this directory shouldn't exist unless they are .wants
+
 ## IPv6-files
 
 The IPv6 files are copied from https://www.reddit.com/r/raspberry_pi/comments/14vcpz/rpi_as_an_ipv6_router_using_a_sixxs_tunnel_and/
diff --git a/etc/systemd/system/dnscrypt/dnscrypt-proxy.service b/etc/systemd/system/dnscrypt/dnscrypt-proxy.service
new file mode 100644
index 00000000..56e1c471
--- /dev/null
+++ b/etc/systemd/system/dnscrypt/dnscrypt-proxy.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=DNSCrypt client proxy
+Requires=dnscrypt-proxy.socket
+
+[Install]
+Also=dnscrypt-proxy.socket
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+NonBlocking=true
+ExecStart=/usr/bin/dnscrypt-proxy -r 95.175.99.231:443 -k 8458:11E2:D322:DAA3:1544:960B:F6C3:000E:910A:C1A6:DE38:8D94:BD1D:EDEA:B60F:0560 -N 2.dnscrypt-cert.fvz-rec-fi-ulv-01.dnsrec.meo.ws
diff --git a/etc/systemd/system/dnscrypt/dnscrypt-proxy.socket b/etc/systemd/system/dnscrypt/dnscrypt-proxy.socket
new file mode 100644
index 00000000..4c5b63f5
--- /dev/null
+++ b/etc/systemd/system/dnscrypt/dnscrypt-proxy.socket
@@ -0,0 +1,11 @@
+[Unit]
+Description=dnscrypt-proxy listening socket
+After=network-online.target
+
+[Socket]
+ListenStream=127.0.0.1:54
+ListenDatagram=127.0.0.1:54
+
+[Install]
+WantedBy=sockets.target
+
diff --git a/etc/systemd/system/ipv6-ula.service b/etc/systemd/system/ipv6/ipv6-ula.service
similarity index 100%
rename from etc/systemd/system/ipv6-ula.service
rename to etc/systemd/system/ipv6/ipv6-ula.service
diff --git a/etc/systemd/system/ipv6.service b/etc/systemd/system/ipv6/ipv6.service
similarity index 100%
rename from etc/systemd/system/ipv6.service
rename to etc/systemd/system/ipv6/ipv6.service
diff --git a/etc/systemd/system/miredo.service b/etc/systemd/system/ipv6/miredo.service
similarity index 100%
rename from etc/systemd/system/miredo.service
rename to etc/systemd/system/ipv6/miredo.service
diff --git a/etc/systemd/system/supybot.service b/etc/systemd/system/irc/supybot.service
similarity index 100%
rename from etc/systemd/system/supybot.service
rename to etc/systemd/system/irc/supybot.service
diff --git a/etc/systemd/system/znc.service b/etc/systemd/system/irc/znc.service
similarity index 100%
rename from etc/systemd/system/znc.service
rename to etc/systemd/system/irc/znc.service
diff --git a/etc/systemd/system/aliendalvik-stopper.service b/etc/systemd/system/sailfish/aliendalvik-stopper.service
similarity index 100%
rename from etc/systemd/system/aliendalvik-stopper.service
rename to etc/systemd/system/sailfish/aliendalvik-stopper.service
diff --git a/etc/systemd/system/aliendalvik-stopper.timer b/etc/systemd/system/sailfish/aliendalvik-stopper.timer
similarity index 100%
rename from etc/systemd/system/aliendalvik-stopper.timer
rename to etc/systemd/system/sailfish/aliendalvik-stopper.timer
diff --git a/etc/systemd/system/ydns-simple.service b/etc/systemd/system/sailfish/ydns-simple.service
similarity index 100%
rename from etc/systemd/system/ydns-simple.service
rename to etc/systemd/system/sailfish/ydns-simple.service
diff --git a/etc/systemd/system/ydns-simple.timer b/etc/systemd/system/sailfish/ydns-simple.timer
similarity index 100%
rename from etc/systemd/system/ydns-simple.timer
rename to etc/systemd/system/sailfish/ydns-simple.timer