diff --git a/data/etc/plinth/modules-enabled/apache b/plinth/modules/apache/data/etc/plinth/modules-enabled/apache
similarity index 100%
rename from data/etc/plinth/modules-enabled/apache
rename to plinth/modules/apache/data/etc/plinth/modules-enabled/apache
diff --git a/data/etc/plinth/modules-enabled/api b/plinth/modules/api/data/etc/plinth/modules-enabled/api
similarity index 100%
rename from data/etc/plinth/modules-enabled/api
rename to plinth/modules/api/data/etc/plinth/modules-enabled/api
diff --git a/data/etc/plinth/modules-enabled/avahi b/plinth/modules/avahi/data/etc/plinth/modules-enabled/avahi
similarity index 100%
rename from data/etc/plinth/modules-enabled/avahi
rename to plinth/modules/avahi/data/etc/plinth/modules-enabled/avahi
diff --git a/data/etc/plinth/modules-enabled/backups b/plinth/modules/backups/data/etc/plinth/modules-enabled/backups
similarity index 100%
rename from data/etc/plinth/modules-enabled/backups
rename to plinth/modules/backups/data/etc/plinth/modules-enabled/backups
diff --git a/data/etc/plinth/modules-enabled/bind b/plinth/modules/bind/data/etc/plinth/modules-enabled/bind
similarity index 100%
rename from data/etc/plinth/modules-enabled/bind
rename to plinth/modules/bind/data/etc/plinth/modules-enabled/bind
diff --git a/data/etc/plinth/modules-enabled/cockpit b/plinth/modules/cockpit/data/etc/plinth/modules-enabled/cockpit
similarity index 100%
rename from data/etc/plinth/modules-enabled/cockpit
rename to plinth/modules/cockpit/data/etc/plinth/modules-enabled/cockpit
diff --git a/data/etc/plinth/modules-enabled/config b/plinth/modules/config/data/etc/plinth/modules-enabled/config
similarity index 100%
rename from data/etc/plinth/modules-enabled/config
rename to plinth/modules/config/data/etc/plinth/modules-enabled/config
diff --git a/data/etc/plinth/modules-enabled/coquelicot b/plinth/modules/coquelicot/data/etc/plinth/modules-enabled/coquelicot
similarity index 100%
rename from data/etc/plinth/modules-enabled/coquelicot
rename to plinth/modules/coquelicot/data/etc/plinth/modules-enabled/coquelicot
diff --git a/data/etc/plinth/modules-enabled/datetime b/plinth/modules/datetime/data/etc/plinth/modules-enabled/datetime
similarity index 100%
rename from data/etc/plinth/modules-enabled/datetime
rename to plinth/modules/datetime/data/etc/plinth/modules-enabled/datetime
diff --git a/data/etc/plinth/modules-enabled/deluge b/plinth/modules/deluge/data/etc/plinth/modules-enabled/deluge
similarity index 100%
rename from data/etc/plinth/modules-enabled/deluge
rename to plinth/modules/deluge/data/etc/plinth/modules-enabled/deluge
diff --git a/data/etc/plinth/modules-enabled/diagnostics b/plinth/modules/diagnostics/data/etc/plinth/modules-enabled/diagnostics
similarity index 100%
rename from data/etc/plinth/modules-enabled/diagnostics
rename to plinth/modules/diagnostics/data/etc/plinth/modules-enabled/diagnostics
diff --git a/data/etc/plinth/modules-enabled/dynamicdns b/plinth/modules/dynamicdns/data/etc/plinth/modules-enabled/dynamicdns
similarity index 100%
rename from data/etc/plinth/modules-enabled/dynamicdns
rename to plinth/modules/dynamicdns/data/etc/plinth/modules-enabled/dynamicdns
diff --git a/data/etc/plinth/modules-enabled/ejabberd b/plinth/modules/ejabberd/data/etc/plinth/modules-enabled/ejabberd
similarity index 100%
rename from data/etc/plinth/modules-enabled/ejabberd
rename to plinth/modules/ejabberd/data/etc/plinth/modules-enabled/ejabberd
diff --git a/data/etc/plinth/modules-enabled/firewall b/plinth/modules/firewall/data/etc/plinth/modules-enabled/firewall
similarity index 100%
rename from data/etc/plinth/modules-enabled/firewall
rename to plinth/modules/firewall/data/etc/plinth/modules-enabled/firewall
diff --git a/data/etc/plinth/modules-enabled/first_boot b/plinth/modules/first_boot/data/etc/plinth/modules-enabled/first_boot
similarity index 100%
rename from data/etc/plinth/modules-enabled/first_boot
rename to plinth/modules/first_boot/data/etc/plinth/modules-enabled/first_boot
diff --git a/data/etc/plinth/modules-enabled/help b/plinth/modules/help/data/etc/plinth/modules-enabled/help
similarity index 100%
rename from data/etc/plinth/modules-enabled/help
rename to plinth/modules/help/data/etc/plinth/modules-enabled/help
diff --git a/data/etc/plinth/modules-enabled/ikiwiki b/plinth/modules/ikiwiki/data/etc/plinth/modules-enabled/ikiwiki
similarity index 100%
rename from data/etc/plinth/modules-enabled/ikiwiki
rename to plinth/modules/ikiwiki/data/etc/plinth/modules-enabled/ikiwiki
diff --git a/data/etc/plinth/modules-enabled/infinoted b/plinth/modules/infinoted/data/etc/plinth/modules-enabled/infinoted
similarity index 100%
rename from data/etc/plinth/modules-enabled/infinoted
rename to plinth/modules/infinoted/data/etc/plinth/modules-enabled/infinoted
diff --git a/data/etc/plinth/modules-enabled/jsxc b/plinth/modules/jsxc/data/etc/plinth/modules-enabled/jsxc
similarity index 100%
rename from data/etc/plinth/modules-enabled/jsxc
rename to plinth/modules/jsxc/data/etc/plinth/modules-enabled/jsxc
diff --git a/data/etc/plinth/modules-enabled/letsencrypt b/plinth/modules/letsencrypt/data/etc/plinth/modules-enabled/letsencrypt
similarity index 100%
rename from data/etc/plinth/modules-enabled/letsencrypt
rename to plinth/modules/letsencrypt/data/etc/plinth/modules-enabled/letsencrypt
diff --git a/data/etc/plinth/modules-enabled/matrixsynapse b/plinth/modules/matrixsynapse/data/etc/plinth/modules-enabled/matrixsynapse
similarity index 100%
rename from data/etc/plinth/modules-enabled/matrixsynapse
rename to plinth/modules/matrixsynapse/data/etc/plinth/modules-enabled/matrixsynapse
diff --git a/data/etc/plinth/modules-enabled/mediawiki b/plinth/modules/mediawiki/data/etc/plinth/modules-enabled/mediawiki
similarity index 100%
rename from data/etc/plinth/modules-enabled/mediawiki
rename to plinth/modules/mediawiki/data/etc/plinth/modules-enabled/mediawiki
diff --git a/data/etc/plinth/modules-enabled/minetest b/plinth/modules/minetest/data/etc/plinth/modules-enabled/minetest
similarity index 100%
rename from data/etc/plinth/modules-enabled/minetest
rename to plinth/modules/minetest/data/etc/plinth/modules-enabled/minetest
diff --git a/data/etc/plinth/modules-enabled/mldonkey b/plinth/modules/mldonkey/data/etc/plinth/modules-enabled/mldonkey
similarity index 100%
rename from data/etc/plinth/modules-enabled/mldonkey
rename to plinth/modules/mldonkey/data/etc/plinth/modules-enabled/mldonkey
diff --git a/data/etc/plinth/modules-enabled/monkeysphere b/plinth/modules/monkeysphere/data/etc/plinth/modules-enabled/monkeysphere
similarity index 100%
rename from data/etc/plinth/modules-enabled/monkeysphere
rename to plinth/modules/monkeysphere/data/etc/plinth/modules-enabled/monkeysphere
diff --git a/data/etc/plinth/modules-enabled/mumble b/plinth/modules/mumble/data/etc/plinth/modules-enabled/mumble
similarity index 100%
rename from data/etc/plinth/modules-enabled/mumble
rename to plinth/modules/mumble/data/etc/plinth/modules-enabled/mumble
diff --git a/data/etc/plinth/modules-enabled/names b/plinth/modules/names/data/etc/plinth/modules-enabled/names
similarity index 100%
rename from data/etc/plinth/modules-enabled/names
rename to plinth/modules/names/data/etc/plinth/modules-enabled/names
diff --git a/data/etc/plinth/modules-enabled/networks b/plinth/modules/networks/data/etc/plinth/modules-enabled/networks
similarity index 100%
rename from data/etc/plinth/modules-enabled/networks
rename to plinth/modules/networks/data/etc/plinth/modules-enabled/networks
diff --git a/data/etc/plinth/modules-enabled/openvpn b/plinth/modules/openvpn/data/etc/plinth/modules-enabled/openvpn
similarity index 100%
rename from data/etc/plinth/modules-enabled/openvpn
rename to plinth/modules/openvpn/data/etc/plinth/modules-enabled/openvpn
diff --git a/data/etc/plinth/modules-enabled/pagekite b/plinth/modules/pagekite/data/etc/plinth/modules-enabled/pagekite
similarity index 100%
rename from data/etc/plinth/modules-enabled/pagekite
rename to plinth/modules/pagekite/data/etc/plinth/modules-enabled/pagekite
diff --git a/data/etc/plinth/modules-enabled/power b/plinth/modules/power/data/etc/plinth/modules-enabled/power
similarity index 100%
rename from data/etc/plinth/modules-enabled/power
rename to plinth/modules/power/data/etc/plinth/modules-enabled/power
diff --git a/data/etc/plinth/modules-enabled/privoxy b/plinth/modules/privoxy/data/etc/plinth/modules-enabled/privoxy
similarity index 100%
rename from data/etc/plinth/modules-enabled/privoxy
rename to plinth/modules/privoxy/data/etc/plinth/modules-enabled/privoxy
diff --git a/data/etc/plinth/modules-enabled/quassel b/plinth/modules/quassel/data/etc/plinth/modules-enabled/quassel
similarity index 100%
rename from data/etc/plinth/modules-enabled/quassel
rename to plinth/modules/quassel/data/etc/plinth/modules-enabled/quassel
diff --git a/data/etc/plinth/modules-enabled/radicale b/plinth/modules/radicale/data/etc/plinth/modules-enabled/radicale
similarity index 100%
rename from data/etc/plinth/modules-enabled/radicale
rename to plinth/modules/radicale/data/etc/plinth/modules-enabled/radicale
diff --git a/data/etc/plinth/modules-enabled/repro b/plinth/modules/repro/data/etc/plinth/modules-enabled/repro
similarity index 100%
rename from data/etc/plinth/modules-enabled/repro
rename to plinth/modules/repro/data/etc/plinth/modules-enabled/repro
diff --git a/data/etc/plinth/modules-enabled/restore b/plinth/modules/restore/data/etc/plinth/modules-enabled/restore
similarity index 100%
rename from data/etc/plinth/modules-enabled/restore
rename to plinth/modules/restore/data/etc/plinth/modules-enabled/restore
diff --git a/data/etc/plinth/modules-enabled/roundcube b/plinth/modules/roundcube/data/etc/plinth/modules-enabled/roundcube
similarity index 100%
rename from data/etc/plinth/modules-enabled/roundcube
rename to plinth/modules/roundcube/data/etc/plinth/modules-enabled/roundcube
diff --git a/data/etc/plinth/modules-enabled/searx b/plinth/modules/searx/data/etc/plinth/modules-enabled/searx
similarity index 100%
rename from data/etc/plinth/modules-enabled/searx
rename to plinth/modules/searx/data/etc/plinth/modules-enabled/searx
diff --git a/data/etc/plinth/modules-enabled/security b/plinth/modules/security/data/etc/plinth/modules-enabled/security
similarity index 100%
rename from data/etc/plinth/modules-enabled/security
rename to plinth/modules/security/data/etc/plinth/modules-enabled/security
diff --git a/data/etc/plinth/modules-enabled/shaarli b/plinth/modules/shaarli/data/etc/plinth/modules-enabled/shaarli
similarity index 100%
rename from data/etc/plinth/modules-enabled/shaarli
rename to plinth/modules/shaarli/data/etc/plinth/modules-enabled/shaarli
diff --git a/data/etc/plinth/modules-enabled/shadowsocks b/plinth/modules/shadowsocks/data/etc/plinth/modules-enabled/shadowsocks
similarity index 100%
rename from data/etc/plinth/modules-enabled/shadowsocks
rename to plinth/modules/shadowsocks/data/etc/plinth/modules-enabled/shadowsocks
diff --git a/data/etc/plinth/modules-enabled/sharing b/plinth/modules/sharing/data/etc/plinth/modules-enabled/sharing
similarity index 100%
rename from data/etc/plinth/modules-enabled/sharing
rename to plinth/modules/sharing/data/etc/plinth/modules-enabled/sharing
diff --git a/data/etc/plinth/modules-enabled/snapshot b/plinth/modules/snapshot/data/etc/plinth/modules-enabled/snapshot
similarity index 100%
rename from data/etc/plinth/modules-enabled/snapshot
rename to plinth/modules/snapshot/data/etc/plinth/modules-enabled/snapshot
diff --git a/data/etc/plinth/modules-enabled/ssh b/plinth/modules/ssh/data/etc/plinth/modules-enabled/ssh
similarity index 100%
rename from data/etc/plinth/modules-enabled/ssh
rename to plinth/modules/ssh/data/etc/plinth/modules-enabled/ssh
diff --git a/data/etc/plinth/modules-enabled/sso b/plinth/modules/sso/data/etc/plinth/modules-enabled/sso
similarity index 100%
rename from data/etc/plinth/modules-enabled/sso
rename to plinth/modules/sso/data/etc/plinth/modules-enabled/sso
diff --git a/data/etc/plinth/modules-enabled/storage b/plinth/modules/storage/data/etc/plinth/modules-enabled/storage
similarity index 100%
rename from data/etc/plinth/modules-enabled/storage
rename to plinth/modules/storage/data/etc/plinth/modules-enabled/storage
diff --git a/data/etc/plinth/modules-enabled/syncthing b/plinth/modules/syncthing/data/etc/plinth/modules-enabled/syncthing
similarity index 100%
rename from data/etc/plinth/modules-enabled/syncthing
rename to plinth/modules/syncthing/data/etc/plinth/modules-enabled/syncthing
diff --git a/data/etc/plinth/modules-enabled/tahoe b/plinth/modules/tahoe/data/etc/plinth/modules-enabled/tahoe
similarity index 100%
rename from data/etc/plinth/modules-enabled/tahoe
rename to plinth/modules/tahoe/data/etc/plinth/modules-enabled/tahoe
diff --git a/data/etc/plinth/modules-enabled/tor b/plinth/modules/tor/data/etc/plinth/modules-enabled/tor
similarity index 100%
rename from data/etc/plinth/modules-enabled/tor
rename to plinth/modules/tor/data/etc/plinth/modules-enabled/tor
diff --git a/data/etc/plinth/modules-enabled/transmission b/plinth/modules/transmission/data/etc/plinth/modules-enabled/transmission
similarity index 100%
rename from data/etc/plinth/modules-enabled/transmission
rename to plinth/modules/transmission/data/etc/plinth/modules-enabled/transmission
diff --git a/data/etc/plinth/modules-enabled/ttrss b/plinth/modules/ttrss/data/etc/plinth/modules-enabled/ttrss
similarity index 100%
rename from data/etc/plinth/modules-enabled/ttrss
rename to plinth/modules/ttrss/data/etc/plinth/modules-enabled/ttrss
diff --git a/data/etc/plinth/modules-enabled/upgrades b/plinth/modules/upgrades/data/etc/plinth/modules-enabled/upgrades
similarity index 100%
rename from data/etc/plinth/modules-enabled/upgrades
rename to plinth/modules/upgrades/data/etc/plinth/modules-enabled/upgrades
diff --git a/data/etc/plinth/modules-enabled/users b/plinth/modules/users/data/etc/plinth/modules-enabled/users
similarity index 100%
rename from data/etc/plinth/modules-enabled/users
rename to plinth/modules/users/data/etc/plinth/modules-enabled/users