diff --git a/data/lib/systemd/system/plinth.service b/data/usr/lib/systemd/system/plinth.service
similarity index 100%
rename from data/lib/systemd/system/plinth.service
rename to data/usr/lib/systemd/system/plinth.service
diff --git a/debian/freedombox.install b/debian/freedombox.install
index d853deb19..feda023b2 100644
--- a/debian/freedombox.install
+++ b/debian/freedombox.install
@@ -1,5 +1,4 @@
 etc
-lib
 usr/bin
 usr/lib
 usr/share/augeas
diff --git a/plinth/modules/bind/data/lib/systemd/system/bind9.service.d/freedombox.conf b/plinth/modules/bind/data/usr/lib/systemd/system/bind9.service.d/freedombox.conf
similarity index 100%
rename from plinth/modules/bind/data/lib/systemd/system/bind9.service.d/freedombox.conf
rename to plinth/modules/bind/data/usr/lib/systemd/system/bind9.service.d/freedombox.conf
diff --git a/plinth/modules/calibre/data/lib/systemd/system/calibre-server-freedombox.service b/plinth/modules/calibre/data/usr/lib/systemd/system/calibre-server-freedombox.service
similarity index 100%
rename from plinth/modules/calibre/data/lib/systemd/system/calibre-server-freedombox.service
rename to plinth/modules/calibre/data/usr/lib/systemd/system/calibre-server-freedombox.service
diff --git a/plinth/modules/config/data/lib/systemd/system/zramswap.service.d/freedombox.conf b/plinth/modules/config/data/usr/lib/systemd/system/zramswap.service.d/freedombox.conf
similarity index 100%
rename from plinth/modules/config/data/lib/systemd/system/zramswap.service.d/freedombox.conf
rename to plinth/modules/config/data/usr/lib/systemd/system/zramswap.service.d/freedombox.conf
diff --git a/plinth/modules/coturn/data/lib/systemd/system/coturn.service.d/freedombox.conf b/plinth/modules/coturn/data/usr/lib/systemd/system/coturn.service.d/freedombox.conf
similarity index 100%
rename from plinth/modules/coturn/data/lib/systemd/system/coturn.service.d/freedombox.conf
rename to plinth/modules/coturn/data/usr/lib/systemd/system/coturn.service.d/freedombox.conf
diff --git a/plinth/modules/deluge/data/lib/systemd/system/deluged.service.d/freedombox.conf b/plinth/modules/deluge/data/usr/lib/systemd/system/deluged.service.d/freedombox.conf
similarity index 100%
rename from plinth/modules/deluge/data/lib/systemd/system/deluged.service.d/freedombox.conf
rename to plinth/modules/deluge/data/usr/lib/systemd/system/deluged.service.d/freedombox.conf
diff --git a/plinth/modules/matrixsynapse/data/lib/systemd/system/matrix-synapse.service.d/freedombox.conf b/plinth/modules/matrixsynapse/data/usr/lib/systemd/system/matrix-synapse.service.d/freedombox.conf
similarity index 100%
rename from plinth/modules/matrixsynapse/data/lib/systemd/system/matrix-synapse.service.d/freedombox.conf
rename to plinth/modules/matrixsynapse/data/usr/lib/systemd/system/matrix-synapse.service.d/freedombox.conf
diff --git a/plinth/modules/mldonkey/data/lib/systemd/system/mldonkey-server.service.d/freedombox.conf b/plinth/modules/mldonkey/data/usr/lib/systemd/system/mldonkey-server.service.d/freedombox.conf
similarity index 100%
rename from plinth/modules/mldonkey/data/lib/systemd/system/mldonkey-server.service.d/freedombox.conf
rename to plinth/modules/mldonkey/data/usr/lib/systemd/system/mldonkey-server.service.d/freedombox.conf
diff --git a/plinth/modules/quassel/data/lib/systemd/system/quasselcore.service.d/freedombox.conf b/plinth/modules/quassel/data/usr/lib/systemd/system/quasselcore.service.d/freedombox.conf
similarity index 100%
rename from plinth/modules/quassel/data/lib/systemd/system/quasselcore.service.d/freedombox.conf
rename to plinth/modules/quassel/data/usr/lib/systemd/system/quasselcore.service.d/freedombox.conf
diff --git a/plinth/modules/shadowsocks/data/lib/systemd/system/shadowsocks-libev-local@.service.d/freedombox.conf b/plinth/modules/shadowsocks/data/usr/lib/systemd/system/shadowsocks-libev-local@.service.d/freedombox.conf
similarity index 100%
rename from plinth/modules/shadowsocks/data/lib/systemd/system/shadowsocks-libev-local@.service.d/freedombox.conf
rename to plinth/modules/shadowsocks/data/usr/lib/systemd/system/shadowsocks-libev-local@.service.d/freedombox.conf
diff --git a/plinth/modules/syncthing/data/lib/systemd/system/syncthing@syncthing.service.d/freedombox.conf b/plinth/modules/syncthing/data/usr/lib/systemd/system/syncthing@syncthing.service.d/freedombox.conf
similarity index 100%
rename from plinth/modules/syncthing/data/lib/systemd/system/syncthing@syncthing.service.d/freedombox.conf
rename to plinth/modules/syncthing/data/usr/lib/systemd/system/syncthing@syncthing.service.d/freedombox.conf
diff --git a/plinth/modules/transmission/data/lib/systemd/system/transmission-daemon.service.d/freedombox.conf b/plinth/modules/transmission/data/usr/lib/systemd/system/transmission-daemon.service.d/freedombox.conf
similarity index 100%
rename from plinth/modules/transmission/data/lib/systemd/system/transmission-daemon.service.d/freedombox.conf
rename to plinth/modules/transmission/data/usr/lib/systemd/system/transmission-daemon.service.d/freedombox.conf
diff --git a/plinth/modules/upgrades/data/lib/systemd/system/freedombox-manual-upgrade.service b/plinth/modules/upgrades/data/usr/lib/systemd/system/freedombox-manual-upgrade.service
similarity index 100%
rename from plinth/modules/upgrades/data/lib/systemd/system/freedombox-manual-upgrade.service
rename to plinth/modules/upgrades/data/usr/lib/systemd/system/freedombox-manual-upgrade.service
diff --git a/plinth/modules/wordpress/data/lib/systemd/system/wordpress-freedombox.service b/plinth/modules/wordpress/data/usr/lib/systemd/system/wordpress-freedombox.service
similarity index 100%
rename from plinth/modules/wordpress/data/lib/systemd/system/wordpress-freedombox.service
rename to plinth/modules/wordpress/data/usr/lib/systemd/system/wordpress-freedombox.service
diff --git a/plinth/modules/wordpress/data/lib/systemd/system/wordpress-freedombox.timer b/plinth/modules/wordpress/data/usr/lib/systemd/system/wordpress-freedombox.timer
similarity index 100%
rename from plinth/modules/wordpress/data/lib/systemd/system/wordpress-freedombox.timer
rename to plinth/modules/wordpress/data/usr/lib/systemd/system/wordpress-freedombox.timer