diff --git a/profiles/abstractions/X.d/complete b/apparmor.d/abstractions/X.d/complete similarity index 100% rename from profiles/abstractions/X.d/complete rename to apparmor.d/abstractions/X.d/complete diff --git a/profiles/abstractions/app-launcher-root b/apparmor.d/abstractions/app-launcher-root similarity index 100% rename from profiles/abstractions/app-launcher-root rename to apparmor.d/abstractions/app-launcher-root diff --git a/profiles/abstractions/app-launcher-user b/apparmor.d/abstractions/app-launcher-user similarity index 100% rename from profiles/abstractions/app-launcher-user rename to apparmor.d/abstractions/app-launcher-user diff --git a/profiles/abstractions/apt-common b/apparmor.d/abstractions/apt-common similarity index 100% rename from profiles/abstractions/apt-common rename to apparmor.d/abstractions/apt-common diff --git a/profiles/abstractions/audio.d/complete b/apparmor.d/abstractions/audio.d/complete similarity index 100% rename from profiles/abstractions/audio.d/complete rename to apparmor.d/abstractions/audio.d/complete diff --git a/profiles/abstractions/base.d/complete b/apparmor.d/abstractions/base.d/complete similarity index 100% rename from profiles/abstractions/base.d/complete rename to apparmor.d/abstractions/base.d/complete diff --git a/profiles/abstractions/deny-dconf b/apparmor.d/abstractions/deny-dconf similarity index 100% rename from profiles/abstractions/deny-dconf rename to apparmor.d/abstractions/deny-dconf diff --git a/profiles/abstractions/deny-root-dir-access b/apparmor.d/abstractions/deny-root-dir-access similarity index 100% rename from profiles/abstractions/deny-root-dir-access rename to apparmor.d/abstractions/deny-root-dir-access diff --git a/profiles/abstractions/devices-usb b/apparmor.d/abstractions/devices-usb similarity index 100% rename from profiles/abstractions/devices-usb rename to apparmor.d/abstractions/devices-usb diff --git a/profiles/abstractions/disks-read b/apparmor.d/abstractions/disks-read similarity index 100% rename from profiles/abstractions/disks-read rename to apparmor.d/abstractions/disks-read diff --git a/profiles/abstractions/disks-write b/apparmor.d/abstractions/disks-write similarity index 100% rename from profiles/abstractions/disks-write rename to apparmor.d/abstractions/disks-write diff --git a/profiles/abstractions/evince b/apparmor.d/abstractions/evince similarity index 100% rename from profiles/abstractions/evince rename to apparmor.d/abstractions/evince diff --git a/profiles/abstractions/file-browsing-strict b/apparmor.d/abstractions/file-browsing-strict similarity index 100% rename from profiles/abstractions/file-browsing-strict rename to apparmor.d/abstractions/file-browsing-strict diff --git a/profiles/abstractions/flatpak-snap b/apparmor.d/abstractions/flatpak-snap similarity index 100% rename from profiles/abstractions/flatpak-snap rename to apparmor.d/abstractions/flatpak-snap diff --git a/profiles/abstractions/fontconfig-cache-read b/apparmor.d/abstractions/fontconfig-cache-read similarity index 100% rename from profiles/abstractions/fontconfig-cache-read rename to apparmor.d/abstractions/fontconfig-cache-read diff --git a/profiles/abstractions/fontconfig-cache-write b/apparmor.d/abstractions/fontconfig-cache-write similarity index 100% rename from profiles/abstractions/fontconfig-cache-write rename to apparmor.d/abstractions/fontconfig-cache-write diff --git a/profiles/abstractions/freedesktop.org.d/complete b/apparmor.d/abstractions/freedesktop.org.d/complete similarity index 100% rename from profiles/abstractions/freedesktop.org.d/complete rename to apparmor.d/abstractions/freedesktop.org.d/complete diff --git a/profiles/abstractions/fzf b/apparmor.d/abstractions/fzf similarity index 100% rename from profiles/abstractions/fzf rename to apparmor.d/abstractions/fzf diff --git a/profiles/abstractions/gstreamer b/apparmor.d/abstractions/gstreamer similarity index 100% rename from profiles/abstractions/gstreamer rename to apparmor.d/abstractions/gstreamer diff --git a/profiles/abstractions/gtk b/apparmor.d/abstractions/gtk similarity index 100% rename from profiles/abstractions/gtk rename to apparmor.d/abstractions/gtk diff --git a/profiles/abstractions/ibus.d/complete b/apparmor.d/abstractions/ibus.d/complete similarity index 100% rename from profiles/abstractions/ibus.d/complete rename to apparmor.d/abstractions/ibus.d/complete diff --git a/profiles/abstractions/kde4 b/apparmor.d/abstractions/kde4 similarity index 100% rename from profiles/abstractions/kde4 rename to apparmor.d/abstractions/kde4 diff --git a/profiles/abstractions/kde5-plasma5 b/apparmor.d/abstractions/kde5-plasma5 similarity index 100% rename from profiles/abstractions/kde5-plasma5 rename to apparmor.d/abstractions/kde5-plasma5 diff --git a/profiles/abstractions/libvirt-lxc b/apparmor.d/abstractions/libvirt-lxc similarity index 100% rename from profiles/abstractions/libvirt-lxc rename to apparmor.d/abstractions/libvirt-lxc diff --git a/profiles/abstractions/libvirt-qemu b/apparmor.d/abstractions/libvirt-qemu similarity index 100% rename from profiles/abstractions/libvirt-qemu rename to apparmor.d/abstractions/libvirt-qemu diff --git a/profiles/abstractions/lightdm b/apparmor.d/abstractions/lightdm similarity index 100% rename from profiles/abstractions/lightdm rename to apparmor.d/abstractions/lightdm diff --git a/profiles/abstractions/lightdm_chromium-browser b/apparmor.d/abstractions/lightdm_chromium-browser similarity index 100% rename from profiles/abstractions/lightdm_chromium-browser rename to apparmor.d/abstractions/lightdm_chromium-browser diff --git a/profiles/abstractions/lxc/container-base b/apparmor.d/abstractions/lxc/container-base similarity index 100% rename from profiles/abstractions/lxc/container-base rename to apparmor.d/abstractions/lxc/container-base diff --git a/profiles/abstractions/lxc/start-container b/apparmor.d/abstractions/lxc/start-container similarity index 100% rename from profiles/abstractions/lxc/start-container rename to apparmor.d/abstractions/lxc/start-container diff --git a/profiles/abstractions/nameservice-strict b/apparmor.d/abstractions/nameservice-strict similarity index 100% rename from profiles/abstractions/nameservice-strict rename to apparmor.d/abstractions/nameservice-strict diff --git a/profiles/abstractions/python.d/complete b/apparmor.d/abstractions/python.d/complete similarity index 100% rename from profiles/abstractions/python.d/complete rename to apparmor.d/abstractions/python.d/complete diff --git a/profiles/abstractions/systemd-common b/apparmor.d/abstractions/systemd-common similarity index 100% rename from profiles/abstractions/systemd-common rename to apparmor.d/abstractions/systemd-common diff --git a/profiles/abstractions/thumbnails-cache-read b/apparmor.d/abstractions/thumbnails-cache-read similarity index 100% rename from profiles/abstractions/thumbnails-cache-read rename to apparmor.d/abstractions/thumbnails-cache-read diff --git a/profiles/abstractions/thumbnails-cache-write b/apparmor.d/abstractions/thumbnails-cache-write similarity index 100% rename from profiles/abstractions/thumbnails-cache-write rename to apparmor.d/abstractions/thumbnails-cache-write diff --git a/profiles/abstractions/tor b/apparmor.d/abstractions/tor similarity index 100% rename from profiles/abstractions/tor rename to apparmor.d/abstractions/tor diff --git a/profiles/abstractions/totem b/apparmor.d/abstractions/totem similarity index 100% rename from profiles/abstractions/totem rename to apparmor.d/abstractions/totem diff --git a/profiles/abstractions/trash b/apparmor.d/abstractions/trash similarity index 100% rename from profiles/abstractions/trash rename to apparmor.d/abstractions/trash diff --git a/profiles/abstractions/user-download-strict b/apparmor.d/abstractions/user-download-strict similarity index 100% rename from profiles/abstractions/user-download-strict rename to apparmor.d/abstractions/user-download-strict diff --git a/profiles/abstractions/vlc-art-cache-write b/apparmor.d/abstractions/vlc-art-cache-write similarity index 100% rename from profiles/abstractions/vlc-art-cache-write rename to apparmor.d/abstractions/vlc-art-cache-write diff --git a/profiles/abstractions/wayland.d/complete b/apparmor.d/abstractions/wayland.d/complete similarity index 100% rename from profiles/abstractions/wayland.d/complete rename to apparmor.d/abstractions/wayland.d/complete diff --git a/profiles/abstractions/wutmp.d/complete b/apparmor.d/abstractions/wutmp.d/complete similarity index 100% rename from profiles/abstractions/wutmp.d/complete rename to apparmor.d/abstractions/wutmp.d/complete diff --git a/profiles/abstractions/zsh b/apparmor.d/abstractions/zsh similarity index 100% rename from profiles/abstractions/zsh rename to apparmor.d/abstractions/zsh diff --git a/profiles/android-studio b/apparmor.d/groups/apps/android-studio similarity index 100% rename from profiles/android-studio rename to apparmor.d/groups/apps/android-studio diff --git a/profiles/atom b/apparmor.d/groups/apps/atom similarity index 100% rename from profiles/atom rename to apparmor.d/groups/apps/atom diff --git a/profiles/calibre b/apparmor.d/groups/apps/calibre similarity index 100% rename from profiles/calibre rename to apparmor.d/groups/apps/calibre diff --git a/profiles/code b/apparmor.d/groups/apps/code similarity index 100% rename from profiles/code rename to apparmor.d/groups/apps/code diff --git a/profiles/discord b/apparmor.d/groups/apps/discord similarity index 100% rename from profiles/discord rename to apparmor.d/groups/apps/discord diff --git a/profiles/discord-chrome-sandbox b/apparmor.d/groups/apps/discord-chrome-sandbox similarity index 100% rename from profiles/discord-chrome-sandbox rename to apparmor.d/groups/apps/discord-chrome-sandbox diff --git a/profiles/dropbox b/apparmor.d/groups/apps/dropbox similarity index 100% rename from profiles/dropbox rename to apparmor.d/groups/apps/dropbox diff --git a/profiles/filezilla b/apparmor.d/groups/apps/filezilla similarity index 100% rename from profiles/filezilla rename to apparmor.d/groups/apps/filezilla diff --git a/profiles/flameshot b/apparmor.d/groups/apps/flameshot similarity index 100% rename from profiles/flameshot rename to apparmor.d/groups/apps/flameshot diff --git a/profiles/freetube b/apparmor.d/groups/apps/freetube similarity index 100% rename from profiles/freetube rename to apparmor.d/groups/apps/freetube diff --git a/profiles/freetube-chrome-sandbox b/apparmor.d/groups/apps/freetube-chrome-sandbox similarity index 100% rename from profiles/freetube-chrome-sandbox rename to apparmor.d/groups/apps/freetube-chrome-sandbox diff --git a/profiles/geany b/apparmor.d/groups/apps/geany similarity index 100% rename from profiles/geany rename to apparmor.d/groups/apps/geany diff --git a/profiles/okular b/apparmor.d/groups/apps/okular similarity index 100% rename from profiles/okular rename to apparmor.d/groups/apps/okular diff --git a/profiles/signal-desktop b/apparmor.d/groups/apps/signal-desktop similarity index 100% rename from profiles/signal-desktop rename to apparmor.d/groups/apps/signal-desktop diff --git a/profiles/signal-desktop-chrome-sandbox b/apparmor.d/groups/apps/signal-desktop-chrome-sandbox similarity index 100% rename from profiles/signal-desktop-chrome-sandbox rename to apparmor.d/groups/apps/signal-desktop-chrome-sandbox diff --git a/profiles/spotify b/apparmor.d/groups/apps/spotify similarity index 100% rename from profiles/spotify rename to apparmor.d/groups/apps/spotify diff --git a/profiles/telegram-desktop b/apparmor.d/groups/apps/telegram-desktop similarity index 100% rename from profiles/telegram-desktop rename to apparmor.d/groups/apps/telegram-desktop diff --git a/profiles/thunderbird b/apparmor.d/groups/apps/thunderbird similarity index 100% rename from profiles/thunderbird rename to apparmor.d/groups/apps/thunderbird diff --git a/profiles/usr.lib.libreoffice.program.oosplash b/apparmor.d/groups/apps/usr.lib.libreoffice.program.oosplash similarity index 100% rename from profiles/usr.lib.libreoffice.program.oosplash rename to apparmor.d/groups/apps/usr.lib.libreoffice.program.oosplash diff --git a/profiles/usr.lib.libreoffice.program.senddoc b/apparmor.d/groups/apps/usr.lib.libreoffice.program.senddoc similarity index 100% rename from profiles/usr.lib.libreoffice.program.senddoc rename to apparmor.d/groups/apps/usr.lib.libreoffice.program.senddoc diff --git a/profiles/usr.lib.libreoffice.program.soffice.bin b/apparmor.d/groups/apps/usr.lib.libreoffice.program.soffice.bin similarity index 100% rename from profiles/usr.lib.libreoffice.program.soffice.bin rename to apparmor.d/groups/apps/usr.lib.libreoffice.program.soffice.bin diff --git a/profiles/usr.lib.libreoffice.program.xpdfimport b/apparmor.d/groups/apps/usr.lib.libreoffice.program.xpdfimport similarity index 100% rename from profiles/usr.lib.libreoffice.program.xpdfimport rename to apparmor.d/groups/apps/usr.lib.libreoffice.program.xpdfimport diff --git a/profiles/vlc b/apparmor.d/groups/apps/vlc similarity index 100% rename from profiles/vlc rename to apparmor.d/groups/apps/vlc diff --git a/profiles/apt b/apparmor.d/groups/apt/apt similarity index 100% rename from profiles/apt rename to apparmor.d/groups/apt/apt diff --git a/profiles/apt-cache b/apparmor.d/groups/apt/apt-cache similarity index 100% rename from profiles/apt-cache rename to apparmor.d/groups/apt/apt-cache diff --git a/profiles/apt-cdrom b/apparmor.d/groups/apt/apt-cdrom similarity index 100% rename from profiles/apt-cdrom rename to apparmor.d/groups/apt/apt-cdrom diff --git a/profiles/apt-config b/apparmor.d/groups/apt/apt-config similarity index 100% rename from profiles/apt-config rename to apparmor.d/groups/apt/apt-config diff --git a/profiles/apt-extracttemplates b/apparmor.d/groups/apt/apt-extracttemplates similarity index 100% rename from profiles/apt-extracttemplates rename to apparmor.d/groups/apt/apt-extracttemplates diff --git a/profiles/apt-file b/apparmor.d/groups/apt/apt-file similarity index 100% rename from profiles/apt-file rename to apparmor.d/groups/apt/apt-file diff --git a/profiles/apt-ftparchive b/apparmor.d/groups/apt/apt-ftparchive similarity index 100% rename from profiles/apt-ftparchive rename to apparmor.d/groups/apt/apt-ftparchive diff --git a/profiles/apt-get b/apparmor.d/groups/apt/apt-get similarity index 100% rename from profiles/apt-get rename to apparmor.d/groups/apt/apt-get diff --git a/profiles/apt-key b/apparmor.d/groups/apt/apt-key similarity index 100% rename from profiles/apt-key rename to apparmor.d/groups/apt/apt-key diff --git a/profiles/apt-listbugs b/apparmor.d/groups/apt/apt-listbugs similarity index 100% rename from profiles/apt-listbugs rename to apparmor.d/groups/apt/apt-listbugs diff --git a/profiles/apt-listbugs-aptcleanup b/apparmor.d/groups/apt/apt-listbugs-aptcleanup similarity index 100% rename from profiles/apt-listbugs-aptcleanup rename to apparmor.d/groups/apt/apt-listbugs-aptcleanup diff --git a/profiles/apt-listbugs-migratepins b/apparmor.d/groups/apt/apt-listbugs-migratepins similarity index 100% rename from profiles/apt-listbugs-migratepins rename to apparmor.d/groups/apt/apt-listbugs-migratepins diff --git a/profiles/apt-listbugs-prefclean b/apparmor.d/groups/apt/apt-listbugs-prefclean similarity index 100% rename from profiles/apt-listbugs-prefclean rename to apparmor.d/groups/apt/apt-listbugs-prefclean diff --git a/profiles/apt-listchanges b/apparmor.d/groups/apt/apt-listchanges similarity index 100% rename from profiles/apt-listchanges rename to apparmor.d/groups/apt/apt-listchanges diff --git a/profiles/apt-mark b/apparmor.d/groups/apt/apt-mark similarity index 100% rename from profiles/apt-mark rename to apparmor.d/groups/apt/apt-mark diff --git a/profiles/apt-methods-cdrom b/apparmor.d/groups/apt/apt-methods-cdrom similarity index 100% rename from profiles/apt-methods-cdrom rename to apparmor.d/groups/apt/apt-methods-cdrom diff --git a/profiles/apt-methods-copy b/apparmor.d/groups/apt/apt-methods-copy similarity index 100% rename from profiles/apt-methods-copy rename to apparmor.d/groups/apt/apt-methods-copy diff --git a/profiles/apt-methods-file b/apparmor.d/groups/apt/apt-methods-file similarity index 100% rename from profiles/apt-methods-file rename to apparmor.d/groups/apt/apt-methods-file diff --git a/profiles/apt-methods-ftp b/apparmor.d/groups/apt/apt-methods-ftp similarity index 100% rename from profiles/apt-methods-ftp rename to apparmor.d/groups/apt/apt-methods-ftp diff --git a/profiles/apt-methods-gpgv b/apparmor.d/groups/apt/apt-methods-gpgv similarity index 100% rename from profiles/apt-methods-gpgv rename to apparmor.d/groups/apt/apt-methods-gpgv diff --git a/profiles/apt-methods-http b/apparmor.d/groups/apt/apt-methods-http similarity index 100% rename from profiles/apt-methods-http rename to apparmor.d/groups/apt/apt-methods-http diff --git a/profiles/apt-methods-mirror b/apparmor.d/groups/apt/apt-methods-mirror similarity index 100% rename from profiles/apt-methods-mirror rename to apparmor.d/groups/apt/apt-methods-mirror diff --git a/profiles/apt-methods-rred b/apparmor.d/groups/apt/apt-methods-rred similarity index 100% rename from profiles/apt-methods-rred rename to apparmor.d/groups/apt/apt-methods-rred diff --git a/profiles/apt-methods-rsh b/apparmor.d/groups/apt/apt-methods-rsh similarity index 100% rename from profiles/apt-methods-rsh rename to apparmor.d/groups/apt/apt-methods-rsh diff --git a/profiles/apt-methods-store b/apparmor.d/groups/apt/apt-methods-store similarity index 100% rename from profiles/apt-methods-store rename to apparmor.d/groups/apt/apt-methods-store diff --git a/profiles/apt-show-versions b/apparmor.d/groups/apt/apt-show-versions similarity index 100% rename from profiles/apt-show-versions rename to apparmor.d/groups/apt/apt-show-versions diff --git a/profiles/apt-sortpkgs b/apparmor.d/groups/apt/apt-sortpkgs similarity index 100% rename from profiles/apt-sortpkgs rename to apparmor.d/groups/apt/apt-sortpkgs diff --git a/profiles/apt-systemd-daily b/apparmor.d/groups/apt/apt-systemd-daily similarity index 100% rename from profiles/apt-systemd-daily rename to apparmor.d/groups/apt/apt-systemd-daily diff --git a/profiles/aptitude b/apparmor.d/groups/apt/aptitude similarity index 100% rename from profiles/aptitude rename to apparmor.d/groups/apt/aptitude diff --git a/profiles/aptitude-changelog-parser b/apparmor.d/groups/apt/aptitude-changelog-parser similarity index 100% rename from profiles/aptitude-changelog-parser rename to apparmor.d/groups/apt/aptitude-changelog-parser diff --git a/profiles/aptitude-create-state-bundle b/apparmor.d/groups/apt/aptitude-create-state-bundle similarity index 100% rename from profiles/aptitude-create-state-bundle rename to apparmor.d/groups/apt/aptitude-create-state-bundle diff --git a/profiles/aptitude-run-state-bundle b/apparmor.d/groups/apt/aptitude-run-state-bundle similarity index 100% rename from profiles/aptitude-run-state-bundle rename to apparmor.d/groups/apt/aptitude-run-state-bundle diff --git a/profiles/child-dpkg b/apparmor.d/groups/apt/child-dpkg similarity index 100% rename from profiles/child-dpkg rename to apparmor.d/groups/apt/child-dpkg diff --git a/profiles/child-dpkg-divert b/apparmor.d/groups/apt/child-dpkg-divert similarity index 100% rename from profiles/child-dpkg-divert rename to apparmor.d/groups/apt/child-dpkg-divert diff --git a/profiles/debconf-apt-progress b/apparmor.d/groups/apt/debconf-apt-progress similarity index 100% rename from profiles/debconf-apt-progress rename to apparmor.d/groups/apt/debconf-apt-progress diff --git a/profiles/dpkg b/apparmor.d/groups/apt/dpkg similarity index 100% rename from profiles/dpkg rename to apparmor.d/groups/apt/dpkg diff --git a/profiles/dpkg-architecture b/apparmor.d/groups/apt/dpkg-architecture similarity index 100% rename from profiles/dpkg-architecture rename to apparmor.d/groups/apt/dpkg-architecture diff --git a/profiles/dpkg-buildflags b/apparmor.d/groups/apt/dpkg-buildflags similarity index 100% rename from profiles/dpkg-buildflags rename to apparmor.d/groups/apt/dpkg-buildflags diff --git a/profiles/dpkg-checkbuilddeps b/apparmor.d/groups/apt/dpkg-checkbuilddeps similarity index 100% rename from profiles/dpkg-checkbuilddeps rename to apparmor.d/groups/apt/dpkg-checkbuilddeps diff --git a/profiles/dpkg-deb b/apparmor.d/groups/apt/dpkg-deb similarity index 100% rename from profiles/dpkg-deb rename to apparmor.d/groups/apt/dpkg-deb diff --git a/profiles/dpkg-divert b/apparmor.d/groups/apt/dpkg-divert similarity index 100% rename from profiles/dpkg-divert rename to apparmor.d/groups/apt/dpkg-divert diff --git a/profiles/dpkg-genbuildinfo b/apparmor.d/groups/apt/dpkg-genbuildinfo similarity index 100% rename from profiles/dpkg-genbuildinfo rename to apparmor.d/groups/apt/dpkg-genbuildinfo diff --git a/profiles/dpkg-genchanges b/apparmor.d/groups/apt/dpkg-genchanges similarity index 100% rename from profiles/dpkg-genchanges rename to apparmor.d/groups/apt/dpkg-genchanges diff --git a/profiles/dpkg-preconfigure b/apparmor.d/groups/apt/dpkg-preconfigure similarity index 100% rename from profiles/dpkg-preconfigure rename to apparmor.d/groups/apt/dpkg-preconfigure diff --git a/profiles/dpkg-query b/apparmor.d/groups/apt/dpkg-query similarity index 100% rename from profiles/dpkg-query rename to apparmor.d/groups/apt/dpkg-query diff --git a/profiles/dpkg-split b/apparmor.d/groups/apt/dpkg-split similarity index 100% rename from profiles/dpkg-split rename to apparmor.d/groups/apt/dpkg-split diff --git a/profiles/dpkg-trigger b/apparmor.d/groups/apt/dpkg-trigger similarity index 100% rename from profiles/dpkg-trigger rename to apparmor.d/groups/apt/dpkg-trigger diff --git a/profiles/dpkg-vendor b/apparmor.d/groups/apt/dpkg-vendor similarity index 100% rename from profiles/dpkg-vendor rename to apparmor.d/groups/apt/dpkg-vendor diff --git a/profiles/synaptic b/apparmor.d/groups/apt/synaptic similarity index 100% rename from profiles/synaptic rename to apparmor.d/groups/apt/synaptic diff --git a/profiles/update-apt-xapian-index b/apparmor.d/groups/apt/update-apt-xapian-index similarity index 100% rename from profiles/update-apt-xapian-index rename to apparmor.d/groups/apt/update-apt-xapian-index diff --git a/profiles/usr.sbin.apt-cacher-ng b/apparmor.d/groups/apt/usr.sbin.apt-cacher-ng similarity index 100% rename from profiles/usr.sbin.apt-cacher-ng rename to apparmor.d/groups/apt/usr.sbin.apt-cacher-ng diff --git a/profiles/brave b/apparmor.d/groups/browsers/brave similarity index 100% rename from profiles/brave rename to apparmor.d/groups/browsers/brave diff --git a/profiles/brave-browser b/apparmor.d/groups/browsers/brave-browser similarity index 100% rename from profiles/brave-browser rename to apparmor.d/groups/browsers/brave-browser diff --git a/profiles/brave-sandbox b/apparmor.d/groups/browsers/brave-sandbox similarity index 100% rename from profiles/brave-sandbox rename to apparmor.d/groups/browsers/brave-sandbox diff --git a/profiles/chromium b/apparmor.d/groups/browsers/chromium similarity index 100% rename from profiles/chromium rename to apparmor.d/groups/browsers/chromium diff --git a/profiles/chromium-chrome-sandbox b/apparmor.d/groups/browsers/chromium-chrome-sandbox similarity index 100% rename from profiles/chromium-chrome-sandbox rename to apparmor.d/groups/browsers/chromium-chrome-sandbox diff --git a/profiles/chromium-chromium b/apparmor.d/groups/browsers/chromium-chromium similarity index 100% rename from profiles/chromium-chromium rename to apparmor.d/groups/browsers/chromium-chromium diff --git a/profiles/firefox b/apparmor.d/groups/browsers/firefox similarity index 100% rename from profiles/firefox rename to apparmor.d/groups/browsers/firefox diff --git a/profiles/firefox-crashreporter b/apparmor.d/groups/browsers/firefox-crashreporter similarity index 100% rename from profiles/firefox-crashreporter rename to apparmor.d/groups/browsers/firefox-crashreporter diff --git a/profiles/firefox-minidump-analyzer b/apparmor.d/groups/browsers/firefox-minidump-analyzer similarity index 100% rename from profiles/firefox-minidump-analyzer rename to apparmor.d/groups/browsers/firefox-minidump-analyzer diff --git a/profiles/firefox-pingsender b/apparmor.d/groups/browsers/firefox-pingsender similarity index 100% rename from profiles/firefox-pingsender rename to apparmor.d/groups/browsers/firefox-pingsender diff --git a/profiles/firefox-plugin-container b/apparmor.d/groups/browsers/firefox-plugin-container similarity index 100% rename from profiles/firefox-plugin-container rename to apparmor.d/groups/browsers/firefox-plugin-container diff --git a/profiles/google-chrome-chrome b/apparmor.d/groups/browsers/google-chrome-chrome similarity index 100% rename from profiles/google-chrome-chrome rename to apparmor.d/groups/browsers/google-chrome-chrome diff --git a/profiles/google-chrome-chrome-sandbox b/apparmor.d/groups/browsers/google-chrome-chrome-sandbox similarity index 100% rename from profiles/google-chrome-chrome-sandbox rename to apparmor.d/groups/browsers/google-chrome-chrome-sandbox diff --git a/profiles/google-chrome-google-chrome b/apparmor.d/groups/browsers/google-chrome-google-chrome similarity index 100% rename from profiles/google-chrome-google-chrome rename to apparmor.d/groups/browsers/google-chrome-google-chrome diff --git a/profiles/opera b/apparmor.d/groups/browsers/opera similarity index 100% rename from profiles/opera rename to apparmor.d/groups/browsers/opera diff --git a/profiles/opera-crashreporter b/apparmor.d/groups/browsers/opera-crashreporter similarity index 100% rename from profiles/opera-crashreporter rename to apparmor.d/groups/browsers/opera-crashreporter diff --git a/profiles/opera-sandbox b/apparmor.d/groups/browsers/opera-sandbox similarity index 100% rename from profiles/opera-sandbox rename to apparmor.d/groups/browsers/opera-sandbox diff --git a/profiles/torbrowser.Browser.firefox b/apparmor.d/groups/browsers/torbrowser.Browser.firefox similarity index 100% rename from profiles/torbrowser.Browser.firefox rename to apparmor.d/groups/browsers/torbrowser.Browser.firefox diff --git a/profiles/torbrowser.Browser.plugin-container b/apparmor.d/groups/browsers/torbrowser.Browser.plugin-container similarity index 100% rename from profiles/torbrowser.Browser.plugin-container rename to apparmor.d/groups/browsers/torbrowser.Browser.plugin-container diff --git a/profiles/torbrowser.Tor.tor b/apparmor.d/groups/browsers/torbrowser.Tor.tor similarity index 100% rename from profiles/torbrowser.Tor.tor rename to apparmor.d/groups/browsers/torbrowser.Tor.tor diff --git a/profiles/cron b/apparmor.d/groups/cron/cron similarity index 100% rename from profiles/cron rename to apparmor.d/groups/cron/cron diff --git a/profiles/cron-apt b/apparmor.d/groups/cron/cron-apt similarity index 100% rename from profiles/cron-apt rename to apparmor.d/groups/cron/cron-apt diff --git a/profiles/cron-apt-compat b/apparmor.d/groups/cron/cron-apt-compat similarity index 100% rename from profiles/cron-apt-compat rename to apparmor.d/groups/cron/cron-apt-compat diff --git a/profiles/cron-apt-listbugs b/apparmor.d/groups/cron/cron-apt-listbugs similarity index 100% rename from profiles/cron-apt-listbugs rename to apparmor.d/groups/cron/cron-apt-listbugs diff --git a/profiles/cron-apt-show-versions b/apparmor.d/groups/cron/cron-apt-show-versions similarity index 100% rename from profiles/cron-apt-show-versions rename to apparmor.d/groups/cron/cron-apt-show-versions diff --git a/profiles/cron-apt-xapian-index b/apparmor.d/groups/cron/cron-apt-xapian-index similarity index 100% rename from profiles/cron-apt-xapian-index rename to apparmor.d/groups/cron/cron-apt-xapian-index diff --git a/profiles/cron-aptitude b/apparmor.d/groups/cron/cron-aptitude similarity index 100% rename from profiles/cron-aptitude rename to apparmor.d/groups/cron/cron-aptitude diff --git a/profiles/cron-debsums b/apparmor.d/groups/cron/cron-debsums similarity index 100% rename from profiles/cron-debsums rename to apparmor.d/groups/cron/cron-debsums diff --git a/profiles/cron-debtags b/apparmor.d/groups/cron/cron-debtags similarity index 100% rename from profiles/cron-debtags rename to apparmor.d/groups/cron/cron-debtags diff --git a/profiles/cron-dlocate b/apparmor.d/groups/cron/cron-dlocate similarity index 100% rename from profiles/cron-dlocate rename to apparmor.d/groups/cron/cron-dlocate diff --git a/profiles/cron-exim4-base b/apparmor.d/groups/cron/cron-exim4-base similarity index 100% rename from profiles/cron-exim4-base rename to apparmor.d/groups/cron/cron-exim4-base diff --git a/profiles/cron-ipset-autoban-save b/apparmor.d/groups/cron/cron-ipset-autoban-save similarity index 100% rename from profiles/cron-ipset-autoban-save rename to apparmor.d/groups/cron/cron-ipset-autoban-save diff --git a/profiles/cron-logrotate b/apparmor.d/groups/cron/cron-logrotate similarity index 100% rename from profiles/cron-logrotate rename to apparmor.d/groups/cron/cron-logrotate diff --git a/profiles/cron-man-db b/apparmor.d/groups/cron/cron-man-db similarity index 100% rename from profiles/cron-man-db rename to apparmor.d/groups/cron/cron-man-db diff --git a/profiles/cron-mlocate b/apparmor.d/groups/cron/cron-mlocate similarity index 100% rename from profiles/cron-mlocate rename to apparmor.d/groups/cron/cron-mlocate diff --git a/profiles/cron-popularity-contest b/apparmor.d/groups/cron/cron-popularity-contest similarity index 100% rename from profiles/cron-popularity-contest rename to apparmor.d/groups/cron/cron-popularity-contest diff --git a/profiles/crontab b/apparmor.d/groups/cron/crontab similarity index 100% rename from profiles/crontab rename to apparmor.d/groups/cron/crontab diff --git a/profiles/accounts-daemon b/apparmor.d/groups/desktop/accounts-daemon similarity index 100% rename from profiles/accounts-daemon rename to apparmor.d/groups/desktop/accounts-daemon diff --git a/profiles/at-spi-bus-launcher b/apparmor.d/groups/desktop/at-spi-bus-launcher similarity index 100% rename from profiles/at-spi-bus-launcher rename to apparmor.d/groups/desktop/at-spi-bus-launcher diff --git a/profiles/at-spi2-registryd b/apparmor.d/groups/desktop/at-spi2-registryd similarity index 100% rename from profiles/at-spi2-registryd rename to apparmor.d/groups/desktop/at-spi2-registryd diff --git a/profiles/blueman b/apparmor.d/groups/desktop/blueman similarity index 100% rename from profiles/blueman rename to apparmor.d/groups/desktop/blueman diff --git a/profiles/blueman-mechanism b/apparmor.d/groups/desktop/blueman-mechanism similarity index 100% rename from profiles/blueman-mechanism rename to apparmor.d/groups/desktop/blueman-mechanism diff --git a/profiles/blueman-rfcomm-watcher b/apparmor.d/groups/desktop/blueman-rfcomm-watcher similarity index 100% rename from profiles/blueman-rfcomm-watcher rename to apparmor.d/groups/desktop/blueman-rfcomm-watcher diff --git a/profiles/bluemoon b/apparmor.d/groups/desktop/bluemoon similarity index 100% rename from profiles/bluemoon rename to apparmor.d/groups/desktop/bluemoon diff --git a/profiles/bluetoothctl b/apparmor.d/groups/desktop/bluetoothctl similarity index 100% rename from profiles/bluetoothctl rename to apparmor.d/groups/desktop/bluetoothctl diff --git a/profiles/bluetoothd b/apparmor.d/groups/desktop/bluetoothd similarity index 100% rename from profiles/bluetoothd rename to apparmor.d/groups/desktop/bluetoothd diff --git a/profiles/colord b/apparmor.d/groups/desktop/colord similarity index 100% rename from profiles/colord rename to apparmor.d/groups/desktop/colord diff --git a/profiles/colord-sane b/apparmor.d/groups/desktop/colord-sane similarity index 100% rename from profiles/colord-sane rename to apparmor.d/groups/desktop/colord-sane diff --git a/profiles/colord-session b/apparmor.d/groups/desktop/colord-session similarity index 100% rename from profiles/colord-session rename to apparmor.d/groups/desktop/colord-session diff --git a/profiles/cpupower b/apparmor.d/groups/desktop/cpupower similarity index 100% rename from profiles/cpupower rename to apparmor.d/groups/desktop/cpupower diff --git a/profiles/dbus-daemon b/apparmor.d/groups/desktop/dbus-daemon similarity index 100% rename from profiles/dbus-daemon rename to apparmor.d/groups/desktop/dbus-daemon diff --git a/profiles/dconf-editor b/apparmor.d/groups/desktop/dconf-editor similarity index 100% rename from profiles/dconf-editor rename to apparmor.d/groups/desktop/dconf-editor diff --git a/profiles/dconf-service b/apparmor.d/groups/desktop/dconf-service similarity index 100% rename from profiles/dconf-service rename to apparmor.d/groups/desktop/dconf-service diff --git a/profiles/gio-launch-desktop b/apparmor.d/groups/gnome/gio-launch-desktop similarity index 100% rename from profiles/gio-launch-desktop rename to apparmor.d/groups/gnome/gio-launch-desktop diff --git a/profiles/dirmngr b/apparmor.d/groups/gpg/dirmngr similarity index 100% rename from profiles/dirmngr rename to apparmor.d/groups/gpg/dirmngr diff --git a/profiles/gpg b/apparmor.d/groups/gpg/gpg similarity index 100% rename from profiles/gpg rename to apparmor.d/groups/gpg/gpg diff --git a/profiles/gpg-agent b/apparmor.d/groups/gpg/gpg-agent similarity index 100% rename from profiles/gpg-agent rename to apparmor.d/groups/gpg/gpg-agent diff --git a/profiles/gpg-connect-agent b/apparmor.d/groups/gpg/gpg-connect-agent similarity index 100% rename from profiles/gpg-connect-agent rename to apparmor.d/groups/gpg/gpg-connect-agent diff --git a/profiles/gpgconf b/apparmor.d/groups/gpg/gpgconf similarity index 100% rename from profiles/gpgconf rename to apparmor.d/groups/gpg/gpgconf diff --git a/profiles/gpgsm b/apparmor.d/groups/gpg/gpgsm similarity index 100% rename from profiles/gpgsm rename to apparmor.d/groups/gpg/gpgsm diff --git a/profiles/scdaemon b/apparmor.d/groups/gpg/scdaemon similarity index 100% rename from profiles/scdaemon rename to apparmor.d/groups/gpg/scdaemon diff --git a/profiles/gvfs-afc-volume-monitor b/apparmor.d/groups/gvfs/gvfs-afc-volume-monitor similarity index 100% rename from profiles/gvfs-afc-volume-monitor rename to apparmor.d/groups/gvfs/gvfs-afc-volume-monitor diff --git a/profiles/gvfs-goa-volume-monitor b/apparmor.d/groups/gvfs/gvfs-goa-volume-monitor similarity index 100% rename from profiles/gvfs-goa-volume-monitor rename to apparmor.d/groups/gvfs/gvfs-goa-volume-monitor diff --git a/profiles/gvfs-gphoto2-volume-monitor b/apparmor.d/groups/gvfs/gvfs-gphoto2-volume-monitor similarity index 100% rename from profiles/gvfs-gphoto2-volume-monitor rename to apparmor.d/groups/gvfs/gvfs-gphoto2-volume-monitor diff --git a/profiles/gvfs-mtp-volume-monitor b/apparmor.d/groups/gvfs/gvfs-mtp-volume-monitor similarity index 100% rename from profiles/gvfs-mtp-volume-monitor rename to apparmor.d/groups/gvfs/gvfs-mtp-volume-monitor diff --git a/profiles/gvfs-udisks2-volume-monitor b/apparmor.d/groups/gvfs/gvfs-udisks2-volume-monitor similarity index 100% rename from profiles/gvfs-udisks2-volume-monitor rename to apparmor.d/groups/gvfs/gvfs-udisks2-volume-monitor diff --git a/profiles/gvfsd b/apparmor.d/groups/gvfs/gvfsd similarity index 100% rename from profiles/gvfsd rename to apparmor.d/groups/gvfs/gvfsd diff --git a/profiles/gvfsd-admin b/apparmor.d/groups/gvfs/gvfsd-admin similarity index 100% rename from profiles/gvfsd-admin rename to apparmor.d/groups/gvfs/gvfsd-admin diff --git a/profiles/gvfsd-afc b/apparmor.d/groups/gvfs/gvfsd-afc similarity index 100% rename from profiles/gvfsd-afc rename to apparmor.d/groups/gvfs/gvfsd-afc diff --git a/profiles/gvfsd-afp b/apparmor.d/groups/gvfs/gvfsd-afp similarity index 100% rename from profiles/gvfsd-afp rename to apparmor.d/groups/gvfs/gvfsd-afp diff --git a/profiles/gvfsd-afp-browse b/apparmor.d/groups/gvfs/gvfsd-afp-browse similarity index 100% rename from profiles/gvfsd-afp-browse rename to apparmor.d/groups/gvfs/gvfsd-afp-browse diff --git a/profiles/gvfsd-archive b/apparmor.d/groups/gvfs/gvfsd-archive similarity index 100% rename from profiles/gvfsd-archive rename to apparmor.d/groups/gvfs/gvfsd-archive diff --git a/profiles/gvfsd-burn b/apparmor.d/groups/gvfs/gvfsd-burn similarity index 100% rename from profiles/gvfsd-burn rename to apparmor.d/groups/gvfs/gvfsd-burn diff --git a/profiles/gvfsd-cdda b/apparmor.d/groups/gvfs/gvfsd-cdda similarity index 100% rename from profiles/gvfsd-cdda rename to apparmor.d/groups/gvfs/gvfsd-cdda diff --git a/profiles/gvfsd-computer b/apparmor.d/groups/gvfs/gvfsd-computer similarity index 100% rename from profiles/gvfsd-computer rename to apparmor.d/groups/gvfs/gvfsd-computer diff --git a/profiles/gvfsd-dav b/apparmor.d/groups/gvfs/gvfsd-dav similarity index 100% rename from profiles/gvfsd-dav rename to apparmor.d/groups/gvfs/gvfsd-dav diff --git a/profiles/gvfsd-dnssd b/apparmor.d/groups/gvfs/gvfsd-dnssd similarity index 100% rename from profiles/gvfsd-dnssd rename to apparmor.d/groups/gvfs/gvfsd-dnssd diff --git a/profiles/gvfsd-ftp b/apparmor.d/groups/gvfs/gvfsd-ftp similarity index 100% rename from profiles/gvfsd-ftp rename to apparmor.d/groups/gvfs/gvfsd-ftp diff --git a/profiles/gvfsd-fuse b/apparmor.d/groups/gvfs/gvfsd-fuse similarity index 100% rename from profiles/gvfsd-fuse rename to apparmor.d/groups/gvfs/gvfsd-fuse diff --git a/profiles/gvfsd-google b/apparmor.d/groups/gvfs/gvfsd-google similarity index 100% rename from profiles/gvfsd-google rename to apparmor.d/groups/gvfs/gvfsd-google diff --git a/profiles/gvfsd-gphoto2 b/apparmor.d/groups/gvfs/gvfsd-gphoto2 similarity index 100% rename from profiles/gvfsd-gphoto2 rename to apparmor.d/groups/gvfs/gvfsd-gphoto2 diff --git a/profiles/gvfsd-http b/apparmor.d/groups/gvfs/gvfsd-http similarity index 100% rename from profiles/gvfsd-http rename to apparmor.d/groups/gvfs/gvfsd-http diff --git a/profiles/gvfsd-localtest b/apparmor.d/groups/gvfs/gvfsd-localtest similarity index 100% rename from profiles/gvfsd-localtest rename to apparmor.d/groups/gvfs/gvfsd-localtest diff --git a/profiles/gvfsd-metadata b/apparmor.d/groups/gvfs/gvfsd-metadata similarity index 100% rename from profiles/gvfsd-metadata rename to apparmor.d/groups/gvfs/gvfsd-metadata diff --git a/profiles/gvfsd-mtp b/apparmor.d/groups/gvfs/gvfsd-mtp similarity index 100% rename from profiles/gvfsd-mtp rename to apparmor.d/groups/gvfs/gvfsd-mtp diff --git a/profiles/gvfsd-network b/apparmor.d/groups/gvfs/gvfsd-network similarity index 100% rename from profiles/gvfsd-network rename to apparmor.d/groups/gvfs/gvfsd-network diff --git a/profiles/gvfsd-nfs b/apparmor.d/groups/gvfs/gvfsd-nfs similarity index 100% rename from profiles/gvfsd-nfs rename to apparmor.d/groups/gvfs/gvfsd-nfs diff --git a/profiles/gvfsd-recent b/apparmor.d/groups/gvfs/gvfsd-recent similarity index 100% rename from profiles/gvfsd-recent rename to apparmor.d/groups/gvfs/gvfsd-recent diff --git a/profiles/gvfsd-sftp b/apparmor.d/groups/gvfs/gvfsd-sftp similarity index 100% rename from profiles/gvfsd-sftp rename to apparmor.d/groups/gvfs/gvfsd-sftp diff --git a/profiles/gvfsd-smb b/apparmor.d/groups/gvfs/gvfsd-smb similarity index 100% rename from profiles/gvfsd-smb rename to apparmor.d/groups/gvfs/gvfsd-smb diff --git a/profiles/gvfsd-smb-browse b/apparmor.d/groups/gvfs/gvfsd-smb-browse similarity index 100% rename from profiles/gvfsd-smb-browse rename to apparmor.d/groups/gvfs/gvfsd-smb-browse diff --git a/profiles/gvfsd-trash b/apparmor.d/groups/gvfs/gvfsd-trash similarity index 100% rename from profiles/gvfsd-trash rename to apparmor.d/groups/gvfs/gvfsd-trash diff --git a/profiles/openvpn b/apparmor.d/groups/network/openvpn similarity index 100% rename from profiles/openvpn rename to apparmor.d/groups/network/openvpn diff --git a/profiles/ssh b/apparmor.d/groups/ssh/ssh similarity index 100% rename from profiles/ssh rename to apparmor.d/groups/ssh/ssh diff --git a/profiles/ssh-agent b/apparmor.d/groups/ssh/ssh-agent similarity index 100% rename from profiles/ssh-agent rename to apparmor.d/groups/ssh/ssh-agent diff --git a/profiles/sshfs b/apparmor.d/groups/ssh/sshfs similarity index 100% rename from profiles/sshfs rename to apparmor.d/groups/ssh/sshfs diff --git a/profiles/child-systemctl b/apparmor.d/groups/systemd/child-systemctl similarity index 100% rename from profiles/child-systemctl rename to apparmor.d/groups/systemd/child-systemctl diff --git a/profiles/systemd-ac-power b/apparmor.d/groups/systemd/systemd-ac-power similarity index 100% rename from profiles/systemd-ac-power rename to apparmor.d/groups/systemd/systemd-ac-power diff --git a/profiles/systemd-analyze b/apparmor.d/groups/systemd/systemd-analyze similarity index 100% rename from profiles/systemd-analyze rename to apparmor.d/groups/systemd/systemd-analyze diff --git a/profiles/systemd-backlight b/apparmor.d/groups/systemd/systemd-backlight similarity index 100% rename from profiles/systemd-backlight rename to apparmor.d/groups/systemd/systemd-backlight diff --git a/profiles/systemd-detect-virt b/apparmor.d/groups/systemd/systemd-detect-virt similarity index 100% rename from profiles/systemd-detect-virt rename to apparmor.d/groups/systemd/systemd-detect-virt diff --git a/profiles/systemd-fsck b/apparmor.d/groups/systemd/systemd-fsck similarity index 100% rename from profiles/systemd-fsck rename to apparmor.d/groups/systemd/systemd-fsck diff --git a/profiles/systemd-fsckd b/apparmor.d/groups/systemd/systemd-fsckd similarity index 100% rename from profiles/systemd-fsckd rename to apparmor.d/groups/systemd/systemd-fsckd diff --git a/profiles/systemd-hostnamed b/apparmor.d/groups/systemd/systemd-hostnamed similarity index 100% rename from profiles/systemd-hostnamed rename to apparmor.d/groups/systemd/systemd-hostnamed diff --git a/profiles/systemd-journalctl b/apparmor.d/groups/systemd/systemd-journalctl similarity index 100% rename from profiles/systemd-journalctl rename to apparmor.d/groups/systemd/systemd-journalctl diff --git a/profiles/systemd-journald b/apparmor.d/groups/systemd/systemd-journald similarity index 100% rename from profiles/systemd-journald rename to apparmor.d/groups/systemd/systemd-journald diff --git a/profiles/systemd-localed b/apparmor.d/groups/systemd/systemd-localed similarity index 100% rename from profiles/systemd-localed rename to apparmor.d/groups/systemd/systemd-localed diff --git a/profiles/systemd-modules-load b/apparmor.d/groups/systemd/systemd-modules-load similarity index 100% rename from profiles/systemd-modules-load rename to apparmor.d/groups/systemd/systemd-modules-load diff --git a/profiles/systemd-networkd b/apparmor.d/groups/systemd/systemd-networkd similarity index 100% rename from profiles/systemd-networkd rename to apparmor.d/groups/systemd/systemd-networkd diff --git a/profiles/systemd-networkd-wait-online b/apparmor.d/groups/systemd/systemd-networkd-wait-online similarity index 100% rename from profiles/systemd-networkd-wait-online rename to apparmor.d/groups/systemd/systemd-networkd-wait-online diff --git a/profiles/systemd-rfkill b/apparmor.d/groups/systemd/systemd-rfkill similarity index 100% rename from profiles/systemd-rfkill rename to apparmor.d/groups/systemd/systemd-rfkill diff --git a/profiles/systemd-shutdown b/apparmor.d/groups/systemd/systemd-shutdown similarity index 100% rename from profiles/systemd-shutdown rename to apparmor.d/groups/systemd/systemd-shutdown diff --git a/profiles/systemd-sysctl b/apparmor.d/groups/systemd/systemd-sysctl similarity index 100% rename from profiles/systemd-sysctl rename to apparmor.d/groups/systemd/systemd-sysctl diff --git a/profiles/systemd-timedated b/apparmor.d/groups/systemd/systemd-timedated similarity index 100% rename from profiles/systemd-timedated rename to apparmor.d/groups/systemd/systemd-timedated diff --git a/profiles/systemd-timesyncd b/apparmor.d/groups/systemd/systemd-timesyncd similarity index 100% rename from profiles/systemd-timesyncd rename to apparmor.d/groups/systemd/systemd-timesyncd diff --git a/profiles/acpi b/apparmor.d/profiles-a-l/acpi similarity index 100% rename from profiles/acpi rename to apparmor.d/profiles-a-l/acpi diff --git a/profiles/adb b/apparmor.d/profiles-a-l/adb similarity index 100% rename from profiles/adb rename to apparmor.d/profiles-a-l/adb diff --git a/profiles/adduser b/apparmor.d/profiles-a-l/adduser similarity index 100% rename from profiles/adduser rename to apparmor.d/profiles-a-l/adduser diff --git a/profiles/adequate b/apparmor.d/profiles-a-l/adequate similarity index 100% rename from profiles/adequate rename to apparmor.d/profiles-a-l/adequate diff --git a/profiles/amarok b/apparmor.d/profiles-a-l/amarok similarity index 100% rename from profiles/amarok rename to apparmor.d/profiles-a-l/amarok diff --git a/profiles/amixer b/apparmor.d/profiles-a-l/amixer similarity index 100% rename from profiles/amixer rename to apparmor.d/profiles-a-l/amixer diff --git a/profiles/anki b/apparmor.d/profiles-a-l/anki similarity index 100% rename from profiles/anki rename to apparmor.d/profiles-a-l/anki diff --git a/profiles/anyremote b/apparmor.d/profiles-a-l/anyremote similarity index 100% rename from profiles/anyremote rename to apparmor.d/profiles-a-l/anyremote diff --git a/profiles/aplay b/apparmor.d/profiles-a-l/aplay similarity index 100% rename from profiles/aplay rename to apparmor.d/profiles-a-l/aplay diff --git a/profiles/appimage-beyond-all-reason b/apparmor.d/profiles-a-l/appimage-beyond-all-reason similarity index 100% rename from profiles/appimage-beyond-all-reason rename to apparmor.d/profiles-a-l/appimage-beyond-all-reason diff --git a/profiles/appstreamcli b/apparmor.d/profiles-a-l/appstreamcli similarity index 100% rename from profiles/appstreamcli rename to apparmor.d/profiles-a-l/appstreamcli diff --git a/profiles/arandr b/apparmor.d/profiles-a-l/arandr similarity index 100% rename from profiles/arandr rename to apparmor.d/profiles-a-l/arandr diff --git a/profiles/arduino b/apparmor.d/profiles-a-l/arduino similarity index 100% rename from profiles/arduino rename to apparmor.d/profiles-a-l/arduino diff --git a/profiles/arduino-builder b/apparmor.d/profiles-a-l/arduino-builder similarity index 100% rename from profiles/arduino-builder rename to apparmor.d/profiles-a-l/arduino-builder diff --git a/profiles/arduino-ctags b/apparmor.d/profiles-a-l/arduino-ctags similarity index 100% rename from profiles/arduino-ctags rename to apparmor.d/profiles-a-l/arduino-ctags diff --git a/profiles/atftpd b/apparmor.d/profiles-a-l/atftpd similarity index 100% rename from profiles/atftpd rename to apparmor.d/profiles-a-l/atftpd diff --git a/profiles/badblocks b/apparmor.d/profiles-a-l/badblocks similarity index 100% rename from profiles/badblocks rename to apparmor.d/profiles-a-l/badblocks diff --git a/profiles/bin.netstat b/apparmor.d/profiles-a-l/bin.netstat similarity index 100% rename from profiles/bin.netstat rename to apparmor.d/profiles-a-l/bin.netstat diff --git a/profiles/biosdecode b/apparmor.d/profiles-a-l/biosdecode similarity index 100% rename from profiles/biosdecode rename to apparmor.d/profiles-a-l/biosdecode diff --git a/profiles/birdtray b/apparmor.d/profiles-a-l/birdtray similarity index 100% rename from profiles/birdtray rename to apparmor.d/profiles-a-l/birdtray diff --git a/profiles/blkid b/apparmor.d/profiles-a-l/blkid similarity index 100% rename from profiles/blkid rename to apparmor.d/profiles-a-l/blkid diff --git a/profiles/blockdev b/apparmor.d/profiles-a-l/blockdev similarity index 100% rename from profiles/blockdev rename to apparmor.d/profiles-a-l/blockdev diff --git a/profiles/bmon b/apparmor.d/profiles-a-l/bmon similarity index 100% rename from profiles/bmon rename to apparmor.d/profiles-a-l/bmon diff --git a/profiles/borg b/apparmor.d/profiles-a-l/borg similarity index 100% rename from profiles/borg rename to apparmor.d/profiles-a-l/borg diff --git a/profiles/btrfs b/apparmor.d/profiles-a-l/btrfs similarity index 100% rename from profiles/btrfs rename to apparmor.d/profiles-a-l/btrfs diff --git a/profiles/btrfs-convert b/apparmor.d/profiles-a-l/btrfs-convert similarity index 100% rename from profiles/btrfs-convert rename to apparmor.d/profiles-a-l/btrfs-convert diff --git a/profiles/btrfs-find-root b/apparmor.d/profiles-a-l/btrfs-find-root similarity index 100% rename from profiles/btrfs-find-root rename to apparmor.d/profiles-a-l/btrfs-find-root diff --git a/profiles/btrfs-image b/apparmor.d/profiles-a-l/btrfs-image similarity index 100% rename from profiles/btrfs-image rename to apparmor.d/profiles-a-l/btrfs-image diff --git a/profiles/btrfs-map-logical b/apparmor.d/profiles-a-l/btrfs-map-logical similarity index 100% rename from profiles/btrfs-map-logical rename to apparmor.d/profiles-a-l/btrfs-map-logical diff --git a/profiles/btrfs-select-super b/apparmor.d/profiles-a-l/btrfs-select-super similarity index 100% rename from profiles/btrfs-select-super rename to apparmor.d/profiles-a-l/btrfs-select-super diff --git a/profiles/btrfstune b/apparmor.d/profiles-a-l/btrfstune similarity index 100% rename from profiles/btrfstune rename to apparmor.d/profiles-a-l/btrfstune diff --git a/profiles/cawbird b/apparmor.d/profiles-a-l/cawbird similarity index 100% rename from profiles/cawbird rename to apparmor.d/profiles-a-l/cawbird diff --git a/profiles/ccze b/apparmor.d/profiles-a-l/ccze similarity index 100% rename from profiles/ccze rename to apparmor.d/profiles-a-l/ccze diff --git a/profiles/cfdisk b/apparmor.d/profiles-a-l/cfdisk similarity index 100% rename from profiles/cfdisk rename to apparmor.d/profiles-a-l/cfdisk diff --git a/profiles/cgdisk b/apparmor.d/profiles-a-l/cgdisk similarity index 100% rename from profiles/cgdisk rename to apparmor.d/profiles-a-l/cgdisk diff --git a/profiles/cgrulesengd b/apparmor.d/profiles-a-l/cgrulesengd similarity index 100% rename from profiles/cgrulesengd rename to apparmor.d/profiles-a-l/cgrulesengd diff --git a/profiles/chage b/apparmor.d/profiles-a-l/chage similarity index 100% rename from profiles/chage rename to apparmor.d/profiles-a-l/chage diff --git a/profiles/changestool b/apparmor.d/profiles-a-l/changestool similarity index 100% rename from profiles/changestool rename to apparmor.d/profiles-a-l/changestool diff --git a/profiles/check-bios-nx b/apparmor.d/profiles-a-l/check-bios-nx similarity index 100% rename from profiles/check-bios-nx rename to apparmor.d/profiles-a-l/check-bios-nx diff --git a/profiles/check-support-status b/apparmor.d/profiles-a-l/check-support-status similarity index 100% rename from profiles/check-support-status rename to apparmor.d/profiles-a-l/check-support-status diff --git a/profiles/check-support-status-hook b/apparmor.d/profiles-a-l/check-support-status-hook similarity index 100% rename from profiles/check-support-status-hook rename to apparmor.d/profiles-a-l/check-support-status-hook diff --git a/profiles/chfn b/apparmor.d/profiles-a-l/chfn similarity index 100% rename from profiles/chfn rename to apparmor.d/profiles-a-l/chfn diff --git a/profiles/child-lsb_release b/apparmor.d/profiles-a-l/child-lsb_release similarity index 100% rename from profiles/child-lsb_release rename to apparmor.d/profiles-a-l/child-lsb_release diff --git a/profiles/child-pager b/apparmor.d/profiles-a-l/child-pager similarity index 100% rename from profiles/child-pager rename to apparmor.d/profiles-a-l/child-pager diff --git a/profiles/chsh b/apparmor.d/profiles-a-l/chsh similarity index 100% rename from profiles/chsh rename to apparmor.d/profiles-a-l/chsh diff --git a/profiles/claws-mail b/apparmor.d/profiles-a-l/claws-mail similarity index 100% rename from profiles/claws-mail rename to apparmor.d/profiles-a-l/claws-mail diff --git a/profiles/command-not-found b/apparmor.d/profiles-a-l/command-not-found similarity index 100% rename from profiles/command-not-found rename to apparmor.d/profiles-a-l/command-not-found diff --git a/profiles/compton b/apparmor.d/profiles-a-l/compton similarity index 100% rename from profiles/compton rename to apparmor.d/profiles-a-l/compton diff --git a/profiles/conky b/apparmor.d/profiles-a-l/conky similarity index 100% rename from profiles/conky rename to apparmor.d/profiles-a-l/conky diff --git a/profiles/convertall b/apparmor.d/profiles-a-l/convertall similarity index 100% rename from profiles/convertall rename to apparmor.d/profiles-a-l/convertall diff --git a/profiles/cppw-cpgr b/apparmor.d/profiles-a-l/cppw-cpgr similarity index 100% rename from profiles/cppw-cpgr rename to apparmor.d/profiles-a-l/cppw-cpgr diff --git a/profiles/cpuid b/apparmor.d/profiles-a-l/cpuid similarity index 100% rename from profiles/cpuid rename to apparmor.d/profiles-a-l/cpuid diff --git a/profiles/crda b/apparmor.d/profiles-a-l/crda similarity index 100% rename from profiles/crda rename to apparmor.d/profiles-a-l/crda diff --git a/profiles/curl b/apparmor.d/profiles-a-l/curl similarity index 100% rename from profiles/curl rename to apparmor.d/profiles-a-l/curl diff --git a/profiles/ddclient b/apparmor.d/profiles-a-l/ddclient similarity index 100% rename from profiles/ddclient rename to apparmor.d/profiles-a-l/ddclient diff --git a/profiles/debconf-show b/apparmor.d/profiles-a-l/debconf-show similarity index 100% rename from profiles/debconf-show rename to apparmor.d/profiles-a-l/debconf-show diff --git a/profiles/deborphan b/apparmor.d/profiles-a-l/deborphan similarity index 100% rename from profiles/deborphan rename to apparmor.d/profiles-a-l/deborphan diff --git a/profiles/debsecan b/apparmor.d/profiles-a-l/debsecan similarity index 100% rename from profiles/debsecan rename to apparmor.d/profiles-a-l/debsecan diff --git a/profiles/debsign b/apparmor.d/profiles-a-l/debsign similarity index 100% rename from profiles/debsign rename to apparmor.d/profiles-a-l/debsign diff --git a/profiles/debsums b/apparmor.d/profiles-a-l/debsums similarity index 100% rename from profiles/debsums rename to apparmor.d/profiles-a-l/debsums diff --git a/profiles/debtags b/apparmor.d/profiles-a-l/debtags similarity index 100% rename from profiles/debtags rename to apparmor.d/profiles-a-l/debtags diff --git a/profiles/deluser b/apparmor.d/profiles-a-l/deluser similarity index 100% rename from profiles/deluser rename to apparmor.d/profiles-a-l/deluser diff --git a/profiles/df b/apparmor.d/profiles-a-l/df similarity index 100% rename from profiles/df rename to apparmor.d/profiles-a-l/df diff --git a/profiles/dfc b/apparmor.d/profiles-a-l/dfc similarity index 100% rename from profiles/dfc rename to apparmor.d/profiles-a-l/dfc diff --git a/profiles/dhclient b/apparmor.d/profiles-a-l/dhclient similarity index 100% rename from profiles/dhclient rename to apparmor.d/profiles-a-l/dhclient diff --git a/profiles/dhclient-script b/apparmor.d/profiles-a-l/dhclient-script similarity index 100% rename from profiles/dhclient-script rename to apparmor.d/profiles-a-l/dhclient-script diff --git a/profiles/dig b/apparmor.d/profiles-a-l/dig similarity index 100% rename from profiles/dig rename to apparmor.d/profiles-a-l/dig diff --git a/profiles/dino-im b/apparmor.d/profiles-a-l/dino-im similarity index 100% rename from profiles/dino-im rename to apparmor.d/profiles-a-l/dino-im diff --git a/profiles/dkms b/apparmor.d/profiles-a-l/dkms similarity index 100% rename from profiles/dkms rename to apparmor.d/profiles-a-l/dkms diff --git a/profiles/dkms-autoinstaller b/apparmor.d/profiles-a-l/dkms-autoinstaller similarity index 100% rename from profiles/dkms-autoinstaller rename to apparmor.d/profiles-a-l/dkms-autoinstaller diff --git a/profiles/dlocate b/apparmor.d/profiles-a-l/dlocate similarity index 100% rename from profiles/dlocate rename to apparmor.d/profiles-a-l/dlocate diff --git a/profiles/dmcrypt-get-device b/apparmor.d/profiles-a-l/dmcrypt-get-device similarity index 100% rename from profiles/dmcrypt-get-device rename to apparmor.d/profiles-a-l/dmcrypt-get-device diff --git a/profiles/dmesg b/apparmor.d/profiles-a-l/dmesg similarity index 100% rename from profiles/dmesg rename to apparmor.d/profiles-a-l/dmesg diff --git a/profiles/dmidecode b/apparmor.d/profiles-a-l/dmidecode similarity index 100% rename from profiles/dmidecode rename to apparmor.d/profiles-a-l/dmidecode diff --git a/profiles/dnscrypt-proxy b/apparmor.d/profiles-a-l/dnscrypt-proxy similarity index 100% rename from profiles/dnscrypt-proxy rename to apparmor.d/profiles-a-l/dnscrypt-proxy diff --git a/profiles/dumpcap b/apparmor.d/profiles-a-l/dumpcap similarity index 100% rename from profiles/dumpcap rename to apparmor.d/profiles-a-l/dumpcap diff --git a/profiles/dumpe2fs b/apparmor.d/profiles-a-l/dumpe2fs similarity index 100% rename from profiles/dumpe2fs rename to apparmor.d/profiles-a-l/dumpe2fs diff --git a/profiles/e2fsck b/apparmor.d/profiles-a-l/e2fsck similarity index 100% rename from profiles/e2fsck rename to apparmor.d/profiles-a-l/e2fsck diff --git a/profiles/e2image b/apparmor.d/profiles-a-l/e2image similarity index 100% rename from profiles/e2image rename to apparmor.d/profiles-a-l/e2image diff --git a/profiles/edid-decode b/apparmor.d/profiles-a-l/edid-decode similarity index 100% rename from profiles/edid-decode rename to apparmor.d/profiles-a-l/edid-decode diff --git a/profiles/eject b/apparmor.d/profiles-a-l/eject similarity index 100% rename from profiles/eject rename to apparmor.d/profiles-a-l/eject diff --git a/profiles/engrampa b/apparmor.d/profiles-a-l/engrampa similarity index 100% rename from profiles/engrampa rename to apparmor.d/profiles-a-l/engrampa diff --git a/profiles/execute-dcut b/apparmor.d/profiles-a-l/execute-dcut similarity index 100% rename from profiles/execute-dcut rename to apparmor.d/profiles-a-l/execute-dcut diff --git a/profiles/execute-dput b/apparmor.d/profiles-a-l/execute-dput similarity index 100% rename from profiles/execute-dput rename to apparmor.d/profiles-a-l/execute-dput diff --git a/profiles/exim4 b/apparmor.d/profiles-a-l/exim4 similarity index 100% rename from profiles/exim4 rename to apparmor.d/profiles-a-l/exim4 diff --git a/profiles/exo-compose-mail b/apparmor.d/profiles-a-l/exo-compose-mail similarity index 100% rename from profiles/exo-compose-mail rename to apparmor.d/profiles-a-l/exo-compose-mail diff --git a/profiles/exo-helper b/apparmor.d/profiles-a-l/exo-helper similarity index 100% rename from profiles/exo-helper rename to apparmor.d/profiles-a-l/exo-helper diff --git a/profiles/exo-open b/apparmor.d/profiles-a-l/exo-open similarity index 100% rename from profiles/exo-open rename to apparmor.d/profiles-a-l/exo-open diff --git a/profiles/f3brew b/apparmor.d/profiles-a-l/f3brew similarity index 100% rename from profiles/f3brew rename to apparmor.d/profiles-a-l/f3brew diff --git a/profiles/f3fix b/apparmor.d/profiles-a-l/f3fix similarity index 100% rename from profiles/f3fix rename to apparmor.d/profiles-a-l/f3fix diff --git a/profiles/f3probe b/apparmor.d/profiles-a-l/f3probe similarity index 100% rename from profiles/f3probe rename to apparmor.d/profiles-a-l/f3probe diff --git a/profiles/f3read b/apparmor.d/profiles-a-l/f3read similarity index 100% rename from profiles/f3read rename to apparmor.d/profiles-a-l/f3read diff --git a/profiles/f3write b/apparmor.d/profiles-a-l/f3write similarity index 100% rename from profiles/f3write rename to apparmor.d/profiles-a-l/f3write diff --git a/profiles/fatlabel b/apparmor.d/profiles-a-l/fatlabel similarity index 100% rename from profiles/fatlabel rename to apparmor.d/profiles-a-l/fatlabel diff --git a/profiles/fatresize b/apparmor.d/profiles-a-l/fatresize similarity index 100% rename from profiles/fatresize rename to apparmor.d/profiles-a-l/fatresize diff --git a/profiles/fc-list b/apparmor.d/profiles-a-l/fc-list similarity index 100% rename from profiles/fc-list rename to apparmor.d/profiles-a-l/fc-list diff --git a/profiles/fdisk b/apparmor.d/profiles-a-l/fdisk similarity index 100% rename from profiles/fdisk rename to apparmor.d/profiles-a-l/fdisk diff --git a/profiles/ffmpeg b/apparmor.d/profiles-a-l/ffmpeg similarity index 100% rename from profiles/ffmpeg rename to apparmor.d/profiles-a-l/ffmpeg diff --git a/profiles/ffplay b/apparmor.d/profiles-a-l/ffplay similarity index 100% rename from profiles/ffplay rename to apparmor.d/profiles-a-l/ffplay diff --git a/profiles/ffprobe b/apparmor.d/profiles-a-l/ffprobe similarity index 100% rename from profiles/ffprobe rename to apparmor.d/profiles-a-l/ffprobe diff --git a/profiles/filecap b/apparmor.d/profiles-a-l/filecap similarity index 100% rename from profiles/filecap rename to apparmor.d/profiles-a-l/filecap diff --git a/profiles/firejail-default b/apparmor.d/profiles-a-l/firejail-default similarity index 100% rename from profiles/firejail-default rename to apparmor.d/profiles-a-l/firejail-default diff --git a/profiles/font-manager b/apparmor.d/profiles-a-l/font-manager similarity index 100% rename from profiles/font-manager rename to apparmor.d/profiles-a-l/font-manager diff --git a/profiles/fping b/apparmor.d/profiles-a-l/fping similarity index 100% rename from profiles/fping rename to apparmor.d/profiles-a-l/fping diff --git a/profiles/fritzing b/apparmor.d/profiles-a-l/fritzing similarity index 100% rename from profiles/fritzing rename to apparmor.d/profiles-a-l/fritzing diff --git a/profiles/frontend b/apparmor.d/profiles-a-l/frontend similarity index 100% rename from profiles/frontend rename to apparmor.d/profiles-a-l/frontend diff --git a/profiles/fsck b/apparmor.d/profiles-a-l/fsck similarity index 100% rename from profiles/fsck rename to apparmor.d/profiles-a-l/fsck diff --git a/profiles/fsck-btrfs b/apparmor.d/profiles-a-l/fsck-btrfs similarity index 100% rename from profiles/fsck-btrfs rename to apparmor.d/profiles-a-l/fsck-btrfs diff --git a/profiles/fsck-fat b/apparmor.d/profiles-a-l/fsck-fat similarity index 100% rename from profiles/fsck-fat rename to apparmor.d/profiles-a-l/fsck-fat diff --git a/profiles/fuseiso b/apparmor.d/profiles-a-l/fuseiso similarity index 100% rename from profiles/fuseiso rename to apparmor.d/profiles-a-l/fuseiso diff --git a/profiles/fusermount b/apparmor.d/profiles-a-l/fusermount similarity index 100% rename from profiles/fusermount rename to apparmor.d/profiles-a-l/fusermount diff --git a/profiles/fwupd b/apparmor.d/profiles-a-l/fwupd similarity index 100% rename from profiles/fwupd rename to apparmor.d/profiles-a-l/fwupd diff --git a/profiles/fwupdmgr b/apparmor.d/profiles-a-l/fwupdmgr similarity index 100% rename from profiles/fwupdmgr rename to apparmor.d/profiles-a-l/fwupdmgr diff --git a/profiles/fzsftp b/apparmor.d/profiles-a-l/fzsftp similarity index 100% rename from profiles/fzsftp rename to apparmor.d/profiles-a-l/fzsftp diff --git a/profiles/gajim b/apparmor.d/profiles-a-l/gajim similarity index 100% rename from profiles/gajim rename to apparmor.d/profiles-a-l/gajim diff --git a/profiles/games-wesnoth b/apparmor.d/profiles-a-l/games-wesnoth similarity index 100% rename from profiles/games-wesnoth rename to apparmor.d/profiles-a-l/games-wesnoth diff --git a/profiles/games-wesnoth-sh b/apparmor.d/profiles-a-l/games-wesnoth-sh similarity index 100% rename from profiles/games-wesnoth-sh rename to apparmor.d/profiles-a-l/games-wesnoth-sh diff --git a/profiles/ganyremote b/apparmor.d/profiles-a-l/ganyremote similarity index 100% rename from profiles/ganyremote rename to apparmor.d/profiles-a-l/ganyremote diff --git a/profiles/gconfd b/apparmor.d/profiles-a-l/gconfd similarity index 100% rename from profiles/gconfd rename to apparmor.d/profiles-a-l/gconfd diff --git a/profiles/gdisk b/apparmor.d/profiles-a-l/gdisk similarity index 100% rename from profiles/gdisk rename to apparmor.d/profiles-a-l/gdisk diff --git a/profiles/git b/apparmor.d/profiles-a-l/git similarity index 100% rename from profiles/git rename to apparmor.d/profiles-a-l/git diff --git a/profiles/globaltime b/apparmor.d/profiles-a-l/globaltime similarity index 100% rename from profiles/globaltime rename to apparmor.d/profiles-a-l/globaltime diff --git a/profiles/glxgears b/apparmor.d/profiles-a-l/glxgears similarity index 100% rename from profiles/glxgears rename to apparmor.d/profiles-a-l/glxgears diff --git a/profiles/glxinfo b/apparmor.d/profiles-a-l/glxinfo similarity index 100% rename from profiles/glxinfo rename to apparmor.d/profiles-a-l/glxinfo diff --git a/profiles/gnome-keyring-daemon b/apparmor.d/profiles-a-l/gnome-keyring-daemon similarity index 100% rename from profiles/gnome-keyring-daemon rename to apparmor.d/profiles-a-l/gnome-keyring-daemon diff --git a/profiles/gpa b/apparmor.d/profiles-a-l/gpa similarity index 100% rename from profiles/gpa rename to apparmor.d/profiles-a-l/gpa diff --git a/profiles/gparted b/apparmor.d/profiles-a-l/gparted similarity index 100% rename from profiles/gparted rename to apparmor.d/profiles-a-l/gparted diff --git a/profiles/gpartedbin b/apparmor.d/profiles-a-l/gpartedbin similarity index 100% rename from profiles/gpartedbin rename to apparmor.d/profiles-a-l/gpartedbin diff --git a/profiles/gpasswd b/apparmor.d/profiles-a-l/gpasswd similarity index 100% rename from profiles/gpasswd rename to apparmor.d/profiles-a-l/gpasswd diff --git a/profiles/gpo b/apparmor.d/profiles-a-l/gpo similarity index 100% rename from profiles/gpo rename to apparmor.d/profiles-a-l/gpo diff --git a/profiles/gpodder b/apparmor.d/profiles-a-l/gpodder similarity index 100% rename from profiles/gpodder rename to apparmor.d/profiles-a-l/gpodder diff --git a/profiles/gpodder-migrate2tres b/apparmor.d/profiles-a-l/gpodder-migrate2tres similarity index 100% rename from profiles/gpodder-migrate2tres rename to apparmor.d/profiles-a-l/gpodder-migrate2tres diff --git a/profiles/groupadd b/apparmor.d/profiles-a-l/groupadd similarity index 100% rename from profiles/groupadd rename to apparmor.d/profiles-a-l/groupadd diff --git a/profiles/groupdel b/apparmor.d/profiles-a-l/groupdel similarity index 100% rename from profiles/groupdel rename to apparmor.d/profiles-a-l/groupdel diff --git a/profiles/groupmod b/apparmor.d/profiles-a-l/groupmod similarity index 100% rename from profiles/groupmod rename to apparmor.d/profiles-a-l/groupmod diff --git a/profiles/groups b/apparmor.d/profiles-a-l/groups similarity index 100% rename from profiles/groups rename to apparmor.d/profiles-a-l/groups diff --git a/profiles/grpck b/apparmor.d/profiles-a-l/grpck similarity index 100% rename from profiles/grpck rename to apparmor.d/profiles-a-l/grpck diff --git a/profiles/gsimplecal b/apparmor.d/profiles-a-l/gsimplecal similarity index 100% rename from profiles/gsimplecal rename to apparmor.d/profiles-a-l/gsimplecal diff --git a/profiles/gsmartcontrol b/apparmor.d/profiles-a-l/gsmartcontrol similarity index 100% rename from profiles/gsmartcontrol rename to apparmor.d/profiles-a-l/gsmartcontrol diff --git a/profiles/gsmartcontrol-root b/apparmor.d/profiles-a-l/gsmartcontrol-root similarity index 100% rename from profiles/gsmartcontrol-root rename to apparmor.d/profiles-a-l/gsmartcontrol-root diff --git a/profiles/gtk-update-icon-cache b/apparmor.d/profiles-a-l/gtk-update-icon-cache similarity index 100% rename from profiles/gtk-update-icon-cache rename to apparmor.d/profiles-a-l/gtk-update-icon-cache diff --git a/profiles/gtk-youtube-viewer b/apparmor.d/profiles-a-l/gtk-youtube-viewer similarity index 100% rename from profiles/gtk-youtube-viewer rename to apparmor.d/profiles-a-l/gtk-youtube-viewer diff --git a/profiles/gzdoom b/apparmor.d/profiles-a-l/gzdoom similarity index 100% rename from profiles/gzdoom rename to apparmor.d/profiles-a-l/gzdoom diff --git a/profiles/hardinfo b/apparmor.d/profiles-a-l/hardinfo similarity index 100% rename from profiles/hardinfo rename to apparmor.d/profiles-a-l/hardinfo diff --git a/profiles/hciconfig b/apparmor.d/profiles-a-l/hciconfig similarity index 100% rename from profiles/hciconfig rename to apparmor.d/profiles-a-l/hciconfig diff --git a/profiles/hddtemp b/apparmor.d/profiles-a-l/hddtemp similarity index 100% rename from profiles/hddtemp rename to apparmor.d/profiles-a-l/hddtemp diff --git a/profiles/hdparm b/apparmor.d/profiles-a-l/hdparm similarity index 100% rename from profiles/hdparm rename to apparmor.d/profiles-a-l/hdparm diff --git a/profiles/hexchat b/apparmor.d/profiles-a-l/hexchat similarity index 100% rename from profiles/hexchat rename to apparmor.d/profiles-a-l/hexchat diff --git a/profiles/hostname b/apparmor.d/profiles-a-l/hostname similarity index 100% rename from profiles/hostname rename to apparmor.d/profiles-a-l/hostname diff --git a/profiles/htop b/apparmor.d/profiles-a-l/htop similarity index 100% rename from profiles/htop rename to apparmor.d/profiles-a-l/htop diff --git a/profiles/hugeadm b/apparmor.d/profiles-a-l/hugeadm similarity index 100% rename from profiles/hugeadm rename to apparmor.d/profiles-a-l/hugeadm diff --git a/profiles/hugo b/apparmor.d/profiles-a-l/hugo similarity index 100% rename from profiles/hugo rename to apparmor.d/profiles-a-l/hugo diff --git a/profiles/hw-probe b/apparmor.d/profiles-a-l/hw-probe similarity index 100% rename from profiles/hw-probe rename to apparmor.d/profiles-a-l/hw-probe diff --git a/profiles/hwinfo b/apparmor.d/profiles-a-l/hwinfo similarity index 100% rename from profiles/hwinfo rename to apparmor.d/profiles-a-l/hwinfo diff --git a/profiles/hypnotix b/apparmor.d/profiles-a-l/hypnotix similarity index 100% rename from profiles/hypnotix rename to apparmor.d/profiles-a-l/hypnotix diff --git a/profiles/i2cdetect b/apparmor.d/profiles-a-l/i2cdetect similarity index 100% rename from profiles/i2cdetect rename to apparmor.d/profiles-a-l/i2cdetect diff --git a/profiles/i3lock b/apparmor.d/profiles-a-l/i3lock similarity index 100% rename from profiles/i3lock rename to apparmor.d/profiles-a-l/i3lock diff --git a/profiles/i3lock-fancy b/apparmor.d/profiles-a-l/i3lock-fancy similarity index 100% rename from profiles/i3lock-fancy rename to apparmor.d/profiles-a-l/i3lock-fancy diff --git a/profiles/id b/apparmor.d/profiles-a-l/id similarity index 100% rename from profiles/id rename to apparmor.d/profiles-a-l/id diff --git a/profiles/ifconfig b/apparmor.d/profiles-a-l/ifconfig similarity index 100% rename from profiles/ifconfig rename to apparmor.d/profiles-a-l/ifconfig diff --git a/profiles/ifup b/apparmor.d/profiles-a-l/ifup similarity index 100% rename from profiles/ifup rename to apparmor.d/profiles-a-l/ifup diff --git a/profiles/initd-kexec b/apparmor.d/profiles-a-l/initd-kexec similarity index 100% rename from profiles/initd-kexec rename to apparmor.d/profiles-a-l/initd-kexec diff --git a/profiles/initd-kexec-load b/apparmor.d/profiles-a-l/initd-kexec-load similarity index 100% rename from profiles/initd-kexec-load rename to apparmor.d/profiles-a-l/initd-kexec-load diff --git a/profiles/initd-kmod b/apparmor.d/profiles-a-l/initd-kmod similarity index 100% rename from profiles/initd-kmod rename to apparmor.d/profiles-a-l/initd-kmod diff --git a/profiles/install-printerdriver b/apparmor.d/profiles-a-l/install-printerdriver similarity index 100% rename from profiles/install-printerdriver rename to apparmor.d/profiles-a-l/install-printerdriver diff --git a/profiles/inxi b/apparmor.d/profiles-a-l/inxi similarity index 100% rename from profiles/inxi rename to apparmor.d/profiles-a-l/inxi diff --git a/profiles/ioping b/apparmor.d/profiles-a-l/ioping similarity index 100% rename from profiles/ioping rename to apparmor.d/profiles-a-l/ioping diff --git a/profiles/iotop b/apparmor.d/profiles-a-l/iotop similarity index 100% rename from profiles/iotop rename to apparmor.d/profiles-a-l/iotop diff --git a/profiles/ip b/apparmor.d/profiles-a-l/ip similarity index 100% rename from profiles/ip rename to apparmor.d/profiles-a-l/ip diff --git a/profiles/ipcalc b/apparmor.d/profiles-a-l/ipcalc similarity index 100% rename from profiles/ipcalc rename to apparmor.d/profiles-a-l/ipcalc diff --git a/profiles/iw b/apparmor.d/profiles-a-l/iw similarity index 100% rename from profiles/iw rename to apparmor.d/profiles-a-l/iw diff --git a/profiles/iwconfig b/apparmor.d/profiles-a-l/iwconfig similarity index 100% rename from profiles/iwconfig rename to apparmor.d/profiles-a-l/iwconfig diff --git a/profiles/iwlist b/apparmor.d/profiles-a-l/iwlist similarity index 100% rename from profiles/iwlist rename to apparmor.d/profiles-a-l/iwlist diff --git a/profiles/jdownloader b/apparmor.d/profiles-a-l/jdownloader similarity index 100% rename from profiles/jdownloader rename to apparmor.d/profiles-a-l/jdownloader diff --git a/profiles/jdownloader-install b/apparmor.d/profiles-a-l/jdownloader-install similarity index 100% rename from profiles/jdownloader-install rename to apparmor.d/profiles-a-l/jdownloader-install diff --git a/profiles/jekyll b/apparmor.d/profiles-a-l/jekyll similarity index 100% rename from profiles/jekyll rename to apparmor.d/profiles-a-l/jekyll diff --git a/profiles/jgmenu b/apparmor.d/profiles-a-l/jgmenu similarity index 100% rename from profiles/jgmenu rename to apparmor.d/profiles-a-l/jgmenu diff --git a/profiles/kanyremote b/apparmor.d/profiles-a-l/kanyremote similarity index 100% rename from profiles/kanyremote rename to apparmor.d/profiles-a-l/kanyremote diff --git a/profiles/kcheckpass b/apparmor.d/profiles-a-l/kcheckpass similarity index 100% rename from profiles/kcheckpass rename to apparmor.d/profiles-a-l/kcheckpass diff --git a/profiles/kconfig-hardened-check b/apparmor.d/profiles-a-l/kconfig-hardened-check similarity index 100% rename from profiles/kconfig-hardened-check rename to apparmor.d/profiles-a-l/kconfig-hardened-check diff --git a/profiles/keepassxc b/apparmor.d/profiles-a-l/keepassxc similarity index 100% rename from profiles/keepassxc rename to apparmor.d/profiles-a-l/keepassxc diff --git a/profiles/keepassxc-cli b/apparmor.d/profiles-a-l/keepassxc-cli similarity index 100% rename from profiles/keepassxc-cli rename to apparmor.d/profiles-a-l/keepassxc-cli diff --git a/profiles/keepassxc-proxy b/apparmor.d/profiles-a-l/keepassxc-proxy similarity index 100% rename from profiles/keepassxc-proxy rename to apparmor.d/profiles-a-l/keepassxc-proxy diff --git a/profiles/kernel-install b/apparmor.d/profiles-a-l/kernel-install similarity index 100% rename from profiles/kernel-install rename to apparmor.d/profiles-a-l/kernel-install diff --git a/profiles/kerneloops b/apparmor.d/profiles-a-l/kerneloops similarity index 100% rename from profiles/kerneloops rename to apparmor.d/profiles-a-l/kerneloops diff --git a/profiles/kerneloops-applet b/apparmor.d/profiles-a-l/kerneloops-applet similarity index 100% rename from profiles/kerneloops-applet rename to apparmor.d/profiles-a-l/kerneloops-applet diff --git a/profiles/kexec b/apparmor.d/profiles-a-l/kexec similarity index 100% rename from profiles/kexec rename to apparmor.d/profiles-a-l/kexec diff --git a/profiles/kmod b/apparmor.d/profiles-a-l/kmod similarity index 100% rename from profiles/kmod rename to apparmor.d/profiles-a-l/kmod diff --git a/profiles/kodi b/apparmor.d/profiles-a-l/kodi similarity index 100% rename from profiles/kodi rename to apparmor.d/profiles-a-l/kodi diff --git a/profiles/kodi-xrandr b/apparmor.d/profiles-a-l/kodi-xrandr similarity index 100% rename from profiles/kodi-xrandr rename to apparmor.d/profiles-a-l/kodi-xrandr diff --git a/profiles/kscreenlocker-greet b/apparmor.d/profiles-a-l/kscreenlocker-greet similarity index 100% rename from profiles/kscreenlocker-greet rename to apparmor.d/profiles-a-l/kscreenlocker-greet diff --git a/profiles/kvm-ok b/apparmor.d/profiles-a-l/kvm-ok similarity index 100% rename from profiles/kvm-ok rename to apparmor.d/profiles-a-l/kvm-ok diff --git a/profiles/kwalletd5 b/apparmor.d/profiles-a-l/kwalletd5 similarity index 100% rename from profiles/kwalletd5 rename to apparmor.d/profiles-a-l/kwalletd5 diff --git a/profiles/kwalletmanager5 b/apparmor.d/profiles-a-l/kwalletmanager5 similarity index 100% rename from profiles/kwalletmanager5 rename to apparmor.d/profiles-a-l/kwalletmanager5 diff --git a/profiles/labwc b/apparmor.d/profiles-a-l/labwc similarity index 100% rename from profiles/labwc rename to apparmor.d/profiles-a-l/labwc diff --git a/profiles/last b/apparmor.d/profiles-a-l/last similarity index 100% rename from profiles/last rename to apparmor.d/profiles-a-l/last diff --git a/profiles/lastlog b/apparmor.d/profiles-a-l/lastlog similarity index 100% rename from profiles/lastlog rename to apparmor.d/profiles-a-l/lastlog diff --git a/profiles/libvirt/TEMPLATE.lxc b/apparmor.d/profiles-a-l/libvirt/TEMPLATE.lxc similarity index 100% rename from profiles/libvirt/TEMPLATE.lxc rename to apparmor.d/profiles-a-l/libvirt/TEMPLATE.lxc diff --git a/profiles/libvirt/TEMPLATE.qemu b/apparmor.d/profiles-a-l/libvirt/TEMPLATE.qemu similarity index 100% rename from profiles/libvirt/TEMPLATE.qemu rename to apparmor.d/profiles-a-l/libvirt/TEMPLATE.qemu diff --git a/profiles/light b/apparmor.d/profiles-a-l/light similarity index 100% rename from profiles/light rename to apparmor.d/profiles-a-l/light diff --git a/profiles/light-locker b/apparmor.d/profiles-a-l/light-locker similarity index 100% rename from profiles/light-locker rename to apparmor.d/profiles-a-l/light-locker diff --git a/profiles/light-locker-command b/apparmor.d/profiles-a-l/light-locker-command similarity index 100% rename from profiles/light-locker-command rename to apparmor.d/profiles-a-l/light-locker-command diff --git a/profiles/lightdm b/apparmor.d/profiles-a-l/lightdm similarity index 100% rename from profiles/lightdm rename to apparmor.d/profiles-a-l/lightdm diff --git a/profiles/lightdm-gtk-greeter b/apparmor.d/profiles-a-l/lightdm-gtk-greeter similarity index 100% rename from profiles/lightdm-gtk-greeter rename to apparmor.d/profiles-a-l/lightdm-gtk-greeter diff --git a/profiles/lightdm-guest-session b/apparmor.d/profiles-a-l/lightdm-guest-session similarity index 100% rename from profiles/lightdm-guest-session rename to apparmor.d/profiles-a-l/lightdm-guest-session diff --git a/profiles/lightworks b/apparmor.d/profiles-a-l/lightworks similarity index 100% rename from profiles/lightworks rename to apparmor.d/profiles-a-l/lightworks diff --git a/profiles/lightworks-ntcardvt b/apparmor.d/profiles-a-l/lightworks-ntcardvt similarity index 100% rename from profiles/lightworks-ntcardvt rename to apparmor.d/profiles-a-l/lightworks-ntcardvt diff --git a/profiles/linssid b/apparmor.d/profiles-a-l/linssid similarity index 100% rename from profiles/linssid rename to apparmor.d/profiles-a-l/linssid diff --git a/profiles/linux-check-removal b/apparmor.d/profiles-a-l/linux-check-removal similarity index 100% rename from profiles/linux-check-removal rename to apparmor.d/profiles-a-l/linux-check-removal diff --git a/profiles/linux-version b/apparmor.d/profiles-a-l/linux-version similarity index 100% rename from profiles/linux-version rename to apparmor.d/profiles-a-l/linux-version diff --git a/profiles/localepurge b/apparmor.d/profiles-a-l/localepurge similarity index 100% rename from profiles/localepurge rename to apparmor.d/profiles-a-l/localepurge diff --git a/profiles/logrotate b/apparmor.d/profiles-a-l/logrotate similarity index 100% rename from profiles/logrotate rename to apparmor.d/profiles-a-l/logrotate diff --git a/profiles/lsblk b/apparmor.d/profiles-a-l/lsblk similarity index 100% rename from profiles/lsblk rename to apparmor.d/profiles-a-l/lsblk diff --git a/profiles/lscpu b/apparmor.d/profiles-a-l/lscpu similarity index 100% rename from profiles/lscpu rename to apparmor.d/profiles-a-l/lscpu diff --git a/profiles/lsinitramfs b/apparmor.d/profiles-a-l/lsinitramfs similarity index 100% rename from profiles/lsinitramfs rename to apparmor.d/profiles-a-l/lsinitramfs diff --git a/profiles/lspci b/apparmor.d/profiles-a-l/lspci similarity index 100% rename from profiles/lspci rename to apparmor.d/profiles-a-l/lspci diff --git a/profiles/lsusb b/apparmor.d/profiles-a-l/lsusb similarity index 100% rename from profiles/lsusb rename to apparmor.d/profiles-a-l/lsusb diff --git a/profiles/lxappearance b/apparmor.d/profiles-a-l/lxappearance similarity index 100% rename from profiles/lxappearance rename to apparmor.d/profiles-a-l/lxappearance diff --git a/profiles/lxc-containers b/apparmor.d/profiles-a-l/lxc-containers similarity index 100% rename from profiles/lxc-containers rename to apparmor.d/profiles-a-l/lxc-containers diff --git a/profiles/lxc/lxc-default b/apparmor.d/profiles-a-l/lxc/lxc-default similarity index 100% rename from profiles/lxc/lxc-default rename to apparmor.d/profiles-a-l/lxc/lxc-default diff --git a/profiles/lxc/lxc-default-cgns b/apparmor.d/profiles-a-l/lxc/lxc-default-cgns similarity index 100% rename from profiles/lxc/lxc-default-cgns rename to apparmor.d/profiles-a-l/lxc/lxc-default-cgns diff --git a/profiles/lxc/lxc-default-with-mounting b/apparmor.d/profiles-a-l/lxc/lxc-default-with-mounting similarity index 100% rename from profiles/lxc/lxc-default-with-mounting rename to apparmor.d/profiles-a-l/lxc/lxc-default-with-mounting diff --git a/profiles/lxc/lxc-default-with-nesting b/apparmor.d/profiles-a-l/lxc/lxc-default-with-nesting similarity index 100% rename from profiles/lxc/lxc-default-with-nesting rename to apparmor.d/profiles-a-l/lxc/lxc-default-with-nesting diff --git a/profiles/lynx b/apparmor.d/profiles-a-l/lynx similarity index 100% rename from profiles/lynx rename to apparmor.d/profiles-a-l/lynx diff --git a/profiles/macchanger b/apparmor.d/profiles-m-z/macchanger similarity index 100% rename from profiles/macchanger rename to apparmor.d/profiles-m-z/macchanger diff --git a/profiles/mandb b/apparmor.d/profiles-m-z/mandb similarity index 100% rename from profiles/mandb rename to apparmor.d/profiles-m-z/mandb diff --git a/profiles/mediainfo b/apparmor.d/profiles-m-z/mediainfo similarity index 100% rename from profiles/mediainfo rename to apparmor.d/profiles-m-z/mediainfo diff --git a/profiles/megasync b/apparmor.d/profiles-m-z/megasync similarity index 100% rename from profiles/megasync rename to apparmor.d/profiles-m-z/megasync diff --git a/profiles/memtester b/apparmor.d/profiles-m-z/memtester similarity index 100% rename from profiles/memtester rename to apparmor.d/profiles-m-z/memtester diff --git a/profiles/mimetype b/apparmor.d/profiles-m-z/mimetype similarity index 100% rename from profiles/mimetype rename to apparmor.d/profiles-m-z/mimetype diff --git a/profiles/minitube b/apparmor.d/profiles-m-z/minitube similarity index 100% rename from profiles/minitube rename to apparmor.d/profiles-m-z/minitube diff --git a/profiles/mke2fs b/apparmor.d/profiles-m-z/mke2fs similarity index 100% rename from profiles/mke2fs rename to apparmor.d/profiles-m-z/mke2fs diff --git a/profiles/mkfs-btrfs b/apparmor.d/profiles-m-z/mkfs-btrfs similarity index 100% rename from profiles/mkfs-btrfs rename to apparmor.d/profiles-m-z/mkfs-btrfs diff --git a/profiles/mkfs-fat b/apparmor.d/profiles-m-z/mkfs-fat similarity index 100% rename from profiles/mkfs-fat rename to apparmor.d/profiles-m-z/mkfs-fat diff --git a/profiles/mkinitramfs b/apparmor.d/profiles-m-z/mkinitramfs similarity index 100% rename from profiles/mkinitramfs rename to apparmor.d/profiles-m-z/mkinitramfs diff --git a/profiles/mkntfs b/apparmor.d/profiles-m-z/mkntfs similarity index 100% rename from profiles/mkntfs rename to apparmor.d/profiles-m-z/mkntfs diff --git a/profiles/mkswap b/apparmor.d/profiles-m-z/mkswap similarity index 100% rename from profiles/mkswap rename to apparmor.d/profiles-m-z/mkswap diff --git a/profiles/mkvmerge b/apparmor.d/profiles-m-z/mkvmerge similarity index 100% rename from profiles/mkvmerge rename to apparmor.d/profiles-m-z/mkvmerge diff --git a/profiles/mkvtoolnix-gui b/apparmor.d/profiles-m-z/mkvtoolnix-gui similarity index 100% rename from profiles/mkvtoolnix-gui rename to apparmor.d/profiles-m-z/mkvtoolnix-gui diff --git a/profiles/mlocate b/apparmor.d/profiles-m-z/mlocate similarity index 100% rename from profiles/mlocate rename to apparmor.d/profiles-m-z/mlocate diff --git a/profiles/mount b/apparmor.d/profiles-m-z/mount similarity index 100% rename from profiles/mount rename to apparmor.d/profiles-m-z/mount diff --git a/profiles/mount-cifs b/apparmor.d/profiles-m-z/mount-cifs similarity index 100% rename from profiles/mount-cifs rename to apparmor.d/profiles-m-z/mount-cifs diff --git a/profiles/mount-nfs b/apparmor.d/profiles-m-z/mount-nfs similarity index 100% rename from profiles/mount-nfs rename to apparmor.d/profiles-m-z/mount-nfs diff --git a/profiles/mpsyt b/apparmor.d/profiles-m-z/mpsyt similarity index 100% rename from profiles/mpsyt rename to apparmor.d/profiles-m-z/mpsyt diff --git a/profiles/mpv b/apparmor.d/profiles-m-z/mpv similarity index 100% rename from profiles/mpv rename to apparmor.d/profiles-m-z/mpv diff --git a/profiles/mtools b/apparmor.d/profiles-m-z/mtools similarity index 100% rename from profiles/mtools rename to apparmor.d/profiles-m-z/mtools diff --git a/profiles/mumble b/apparmor.d/profiles-m-z/mumble similarity index 100% rename from profiles/mumble rename to apparmor.d/profiles-m-z/mumble diff --git a/profiles/mumble-overlay b/apparmor.d/profiles-m-z/mumble-overlay similarity index 100% rename from profiles/mumble-overlay rename to apparmor.d/profiles-m-z/mumble-overlay diff --git a/profiles/nemo b/apparmor.d/profiles-m-z/nemo similarity index 100% rename from profiles/nemo rename to apparmor.d/profiles-m-z/nemo diff --git a/profiles/netcap b/apparmor.d/profiles-m-z/netcap similarity index 100% rename from profiles/netcap rename to apparmor.d/profiles-m-z/netcap diff --git a/profiles/nethogs b/apparmor.d/profiles-m-z/nethogs similarity index 100% rename from profiles/nethogs rename to apparmor.d/profiles-m-z/nethogs diff --git a/profiles/networkctl b/apparmor.d/profiles-m-z/networkctl similarity index 100% rename from profiles/networkctl rename to apparmor.d/profiles-m-z/networkctl diff --git a/profiles/newgrp b/apparmor.d/profiles-m-z/newgrp similarity index 100% rename from profiles/newgrp rename to apparmor.d/profiles-m-z/newgrp diff --git a/profiles/nft b/apparmor.d/profiles-m-z/nft similarity index 100% rename from profiles/nft rename to apparmor.d/profiles-m-z/nft diff --git a/profiles/nmap b/apparmor.d/profiles-m-z/nmap similarity index 100% rename from profiles/nmap rename to apparmor.d/profiles-m-z/nmap diff --git a/profiles/ntfs-3g b/apparmor.d/profiles-m-z/ntfs-3g similarity index 100% rename from profiles/ntfs-3g rename to apparmor.d/profiles-m-z/ntfs-3g diff --git a/profiles/ntfs-3g-probe b/apparmor.d/profiles-m-z/ntfs-3g-probe similarity index 100% rename from profiles/ntfs-3g-probe rename to apparmor.d/profiles-m-z/ntfs-3g-probe diff --git a/profiles/ntfscat b/apparmor.d/profiles-m-z/ntfscat similarity index 100% rename from profiles/ntfscat rename to apparmor.d/profiles-m-z/ntfscat diff --git a/profiles/ntfsclone b/apparmor.d/profiles-m-z/ntfsclone similarity index 100% rename from profiles/ntfsclone rename to apparmor.d/profiles-m-z/ntfsclone diff --git a/profiles/ntfscluster b/apparmor.d/profiles-m-z/ntfscluster similarity index 100% rename from profiles/ntfscluster rename to apparmor.d/profiles-m-z/ntfscluster diff --git a/profiles/ntfscmp b/apparmor.d/profiles-m-z/ntfscmp similarity index 100% rename from profiles/ntfscmp rename to apparmor.d/profiles-m-z/ntfscmp diff --git a/profiles/ntfscp b/apparmor.d/profiles-m-z/ntfscp similarity index 100% rename from profiles/ntfscp rename to apparmor.d/profiles-m-z/ntfscp diff --git a/profiles/ntfsdecrypt b/apparmor.d/profiles-m-z/ntfsdecrypt similarity index 100% rename from profiles/ntfsdecrypt rename to apparmor.d/profiles-m-z/ntfsdecrypt diff --git a/profiles/ntfsfallocate b/apparmor.d/profiles-m-z/ntfsfallocate similarity index 100% rename from profiles/ntfsfallocate rename to apparmor.d/profiles-m-z/ntfsfallocate diff --git a/profiles/ntfsfix b/apparmor.d/profiles-m-z/ntfsfix similarity index 100% rename from profiles/ntfsfix rename to apparmor.d/profiles-m-z/ntfsfix diff --git a/profiles/ntfsinfo b/apparmor.d/profiles-m-z/ntfsinfo similarity index 100% rename from profiles/ntfsinfo rename to apparmor.d/profiles-m-z/ntfsinfo diff --git a/profiles/ntfslabel b/apparmor.d/profiles-m-z/ntfslabel similarity index 100% rename from profiles/ntfslabel rename to apparmor.d/profiles-m-z/ntfslabel diff --git a/profiles/ntfsls b/apparmor.d/profiles-m-z/ntfsls similarity index 100% rename from profiles/ntfsls rename to apparmor.d/profiles-m-z/ntfsls diff --git a/profiles/ntfsmove b/apparmor.d/profiles-m-z/ntfsmove similarity index 100% rename from profiles/ntfsmove rename to apparmor.d/profiles-m-z/ntfsmove diff --git a/profiles/ntfsrecover b/apparmor.d/profiles-m-z/ntfsrecover similarity index 100% rename from profiles/ntfsrecover rename to apparmor.d/profiles-m-z/ntfsrecover diff --git a/profiles/ntfsresize b/apparmor.d/profiles-m-z/ntfsresize similarity index 100% rename from profiles/ntfsresize rename to apparmor.d/profiles-m-z/ntfsresize diff --git a/profiles/ntfssecaudit b/apparmor.d/profiles-m-z/ntfssecaudit similarity index 100% rename from profiles/ntfssecaudit rename to apparmor.d/profiles-m-z/ntfssecaudit diff --git a/profiles/ntfstruncate b/apparmor.d/profiles-m-z/ntfstruncate similarity index 100% rename from profiles/ntfstruncate rename to apparmor.d/profiles-m-z/ntfstruncate diff --git a/profiles/ntfsundelete b/apparmor.d/profiles-m-z/ntfsundelete similarity index 100% rename from profiles/ntfsundelete rename to apparmor.d/profiles-m-z/ntfsundelete diff --git a/profiles/ntfsusermap b/apparmor.d/profiles-m-z/ntfsusermap similarity index 100% rename from profiles/ntfsusermap rename to apparmor.d/profiles-m-z/ntfsusermap diff --git a/profiles/ntfswipe b/apparmor.d/profiles-m-z/ntfswipe similarity index 100% rename from profiles/ntfswipe rename to apparmor.d/profiles-m-z/ntfswipe diff --git a/profiles/numlockx b/apparmor.d/profiles-m-z/numlockx similarity index 100% rename from profiles/numlockx rename to apparmor.d/profiles-m-z/numlockx diff --git a/profiles/obamenu b/apparmor.d/profiles-m-z/obamenu similarity index 100% rename from profiles/obamenu rename to apparmor.d/profiles-m-z/obamenu diff --git a/profiles/obconf b/apparmor.d/profiles-m-z/obconf similarity index 100% rename from profiles/obconf rename to apparmor.d/profiles-m-z/obconf diff --git a/profiles/obex-folder-listing b/apparmor.d/profiles-m-z/obex-folder-listing similarity index 100% rename from profiles/obex-folder-listing rename to apparmor.d/profiles-m-z/obex-folder-listing diff --git a/profiles/obexautofs b/apparmor.d/profiles-m-z/obexautofs similarity index 100% rename from profiles/obexautofs rename to apparmor.d/profiles-m-z/obexautofs diff --git a/profiles/obexctl b/apparmor.d/profiles-m-z/obexctl similarity index 100% rename from profiles/obexctl rename to apparmor.d/profiles-m-z/obexctl diff --git a/profiles/obexd b/apparmor.d/profiles-m-z/obexd similarity index 100% rename from profiles/obexd rename to apparmor.d/profiles-m-z/obexd diff --git a/profiles/obexfs b/apparmor.d/profiles-m-z/obexfs similarity index 100% rename from profiles/obexfs rename to apparmor.d/profiles-m-z/obexfs diff --git a/profiles/obexpush-atd b/apparmor.d/profiles-m-z/obexpush-atd similarity index 100% rename from profiles/obexpush-atd rename to apparmor.d/profiles-m-z/obexpush-atd diff --git a/profiles/obexpushd b/apparmor.d/profiles-m-z/obexpushd similarity index 100% rename from profiles/obexpushd rename to apparmor.d/profiles-m-z/obexpushd diff --git a/profiles/obxprop b/apparmor.d/profiles-m-z/obxprop similarity index 100% rename from profiles/obxprop rename to apparmor.d/profiles-m-z/obxprop diff --git a/profiles/on-ac-power b/apparmor.d/profiles-m-z/on-ac-power similarity index 100% rename from profiles/on-ac-power rename to apparmor.d/profiles-m-z/on-ac-power diff --git a/profiles/openbox b/apparmor.d/profiles-m-z/openbox similarity index 100% rename from profiles/openbox rename to apparmor.d/profiles-m-z/openbox diff --git a/profiles/openbox-session b/apparmor.d/profiles-m-z/openbox-session similarity index 100% rename from profiles/openbox-session rename to apparmor.d/profiles-m-z/openbox-session diff --git a/profiles/orage b/apparmor.d/profiles-m-z/orage similarity index 100% rename from profiles/orage rename to apparmor.d/profiles-m-z/orage diff --git a/profiles/pacmd b/apparmor.d/profiles-m-z/pacmd similarity index 100% rename from profiles/pacmd rename to apparmor.d/profiles-m-z/pacmd diff --git a/profiles/pactl b/apparmor.d/profiles-m-z/pactl similarity index 100% rename from profiles/pactl rename to apparmor.d/profiles-m-z/pactl diff --git a/profiles/pagesize b/apparmor.d/profiles-m-z/pagesize similarity index 100% rename from profiles/pagesize rename to apparmor.d/profiles-m-z/pagesize diff --git a/profiles/pam-auth-update b/apparmor.d/profiles-m-z/pam-auth-update similarity index 100% rename from profiles/pam-auth-update rename to apparmor.d/profiles-m-z/pam-auth-update diff --git a/profiles/pam/mappings b/apparmor.d/profiles-m-z/pam/mappings similarity index 100% rename from profiles/pam/mappings rename to apparmor.d/profiles-m-z/pam/mappings diff --git a/profiles/pam_roles b/apparmor.d/profiles-m-z/pam_roles similarity index 100% rename from profiles/pam_roles rename to apparmor.d/profiles-m-z/pam_roles diff --git a/profiles/parted b/apparmor.d/profiles-m-z/parted similarity index 100% rename from profiles/parted rename to apparmor.d/profiles-m-z/parted diff --git a/profiles/partprobe b/apparmor.d/profiles-m-z/partprobe similarity index 100% rename from profiles/partprobe rename to apparmor.d/profiles-m-z/partprobe diff --git a/profiles/passwd b/apparmor.d/profiles-m-z/passwd similarity index 100% rename from profiles/passwd rename to apparmor.d/profiles-m-z/passwd diff --git a/profiles/pavucontrol b/apparmor.d/profiles-m-z/pavucontrol similarity index 100% rename from profiles/pavucontrol rename to apparmor.d/profiles-m-z/pavucontrol diff --git a/profiles/pcb-gtk b/apparmor.d/profiles-m-z/pcb-gtk similarity index 100% rename from profiles/pcb-gtk rename to apparmor.d/profiles-m-z/pcb-gtk diff --git a/profiles/picom b/apparmor.d/profiles-m-z/picom similarity index 100% rename from profiles/picom rename to apparmor.d/profiles-m-z/picom diff --git a/profiles/pinentry-gtk-2 b/apparmor.d/profiles-m-z/pinentry-gtk-2 similarity index 100% rename from profiles/pinentry-gtk-2 rename to apparmor.d/profiles-m-z/pinentry-gtk-2 diff --git a/profiles/pinentry-kwallet b/apparmor.d/profiles-m-z/pinentry-kwallet similarity index 100% rename from profiles/pinentry-kwallet rename to apparmor.d/profiles-m-z/pinentry-kwallet diff --git a/profiles/pinentry-qt b/apparmor.d/profiles-m-z/pinentry-qt similarity index 100% rename from profiles/pinentry-qt rename to apparmor.d/profiles-m-z/pinentry-qt diff --git a/profiles/pkexec b/apparmor.d/profiles-m-z/pkexec similarity index 100% rename from profiles/pkexec rename to apparmor.d/profiles-m-z/pkexec diff --git a/profiles/polipo b/apparmor.d/profiles-m-z/polipo similarity index 100% rename from profiles/polipo rename to apparmor.d/profiles-m-z/polipo diff --git a/profiles/polkit-agent-helper b/apparmor.d/profiles-m-z/polkit-agent-helper similarity index 100% rename from profiles/polkit-agent-helper rename to apparmor.d/profiles-m-z/polkit-agent-helper diff --git a/profiles/polkit-kde-authentication-agent b/apparmor.d/profiles-m-z/polkit-kde-authentication-agent similarity index 100% rename from profiles/polkit-kde-authentication-agent rename to apparmor.d/profiles-m-z/polkit-kde-authentication-agent diff --git a/profiles/polkit-mate-authentication-agent b/apparmor.d/profiles-m-z/polkit-mate-authentication-agent similarity index 100% rename from profiles/polkit-mate-authentication-agent rename to apparmor.d/profiles-m-z/polkit-mate-authentication-agent diff --git a/profiles/polkitd b/apparmor.d/profiles-m-z/polkitd similarity index 100% rename from profiles/polkitd rename to apparmor.d/profiles-m-z/polkitd diff --git a/profiles/popcon-largest-unused b/apparmor.d/profiles-m-z/popcon-largest-unused similarity index 100% rename from profiles/popcon-largest-unused rename to apparmor.d/profiles-m-z/popcon-largest-unused diff --git a/profiles/popularity-contest b/apparmor.d/profiles-m-z/popularity-contest similarity index 100% rename from profiles/popularity-contest rename to apparmor.d/profiles-m-z/popularity-contest diff --git a/profiles/ps b/apparmor.d/profiles-m-z/ps similarity index 100% rename from profiles/ps rename to apparmor.d/profiles-m-z/ps diff --git a/profiles/ps-mem b/apparmor.d/profiles-m-z/ps-mem similarity index 100% rename from profiles/ps-mem rename to apparmor.d/profiles-m-z/ps-mem diff --git a/profiles/pscap b/apparmor.d/profiles-m-z/pscap similarity index 100% rename from profiles/pscap rename to apparmor.d/profiles-m-z/pscap diff --git a/profiles/psi-plus b/apparmor.d/profiles-m-z/psi-plus similarity index 100% rename from profiles/psi-plus rename to apparmor.d/profiles-m-z/psi-plus diff --git a/profiles/pulseaudio b/apparmor.d/profiles-m-z/pulseaudio similarity index 100% rename from profiles/pulseaudio rename to apparmor.d/profiles-m-z/pulseaudio diff --git a/profiles/qbittorrent b/apparmor.d/profiles-m-z/qbittorrent similarity index 100% rename from profiles/qbittorrent rename to apparmor.d/profiles-m-z/qbittorrent diff --git a/profiles/qbittorrent-nox b/apparmor.d/profiles-m-z/qbittorrent-nox similarity index 100% rename from profiles/qbittorrent-nox rename to apparmor.d/profiles-m-z/qbittorrent-nox diff --git a/profiles/qnapi b/apparmor.d/profiles-m-z/qnapi similarity index 100% rename from profiles/qnapi rename to apparmor.d/profiles-m-z/qnapi diff --git a/profiles/qpdfview b/apparmor.d/profiles-m-z/qpdfview similarity index 100% rename from profiles/qpdfview rename to apparmor.d/profiles-m-z/qpdfview diff --git a/profiles/qt5ct b/apparmor.d/profiles-m-z/qt5ct similarity index 100% rename from profiles/qt5ct rename to apparmor.d/profiles-m-z/qt5ct diff --git a/profiles/qtchooser b/apparmor.d/profiles-m-z/qtchooser similarity index 100% rename from profiles/qtchooser rename to apparmor.d/profiles-m-z/qtchooser diff --git a/profiles/querybts b/apparmor.d/profiles-m-z/querybts similarity index 100% rename from profiles/querybts rename to apparmor.d/profiles-m-z/querybts diff --git a/profiles/quiterss b/apparmor.d/profiles-m-z/quiterss similarity index 100% rename from profiles/quiterss rename to apparmor.d/profiles-m-z/quiterss diff --git a/profiles/rdmsr b/apparmor.d/profiles-m-z/rdmsr similarity index 100% rename from profiles/rdmsr rename to apparmor.d/profiles-m-z/rdmsr diff --git a/profiles/redshift b/apparmor.d/profiles-m-z/redshift similarity index 100% rename from profiles/redshift rename to apparmor.d/profiles-m-z/redshift diff --git a/profiles/repo b/apparmor.d/profiles-m-z/repo similarity index 100% rename from profiles/repo rename to apparmor.d/profiles-m-z/repo diff --git a/profiles/reportbug b/apparmor.d/profiles-m-z/reportbug similarity index 100% rename from profiles/reportbug rename to apparmor.d/profiles-m-z/reportbug diff --git a/profiles/reprepro b/apparmor.d/profiles-m-z/reprepro similarity index 100% rename from profiles/reprepro rename to apparmor.d/profiles-m-z/reprepro diff --git a/profiles/resize2fs b/apparmor.d/profiles-m-z/resize2fs similarity index 100% rename from profiles/resize2fs rename to apparmor.d/profiles-m-z/resize2fs diff --git a/profiles/rfkill b/apparmor.d/profiles-m-z/rfkill similarity index 100% rename from profiles/rfkill rename to apparmor.d/profiles-m-z/rfkill diff --git a/profiles/rpi-imager b/apparmor.d/profiles-m-z/rpi-imager similarity index 100% rename from profiles/rpi-imager rename to apparmor.d/profiles-m-z/rpi-imager diff --git a/profiles/rredtool b/apparmor.d/profiles-m-z/rredtool similarity index 100% rename from profiles/rredtool rename to apparmor.d/profiles-m-z/rredtool diff --git a/profiles/rsyslogd b/apparmor.d/profiles-m-z/rsyslogd similarity index 100% rename from profiles/rsyslogd rename to apparmor.d/profiles-m-z/rsyslogd diff --git a/profiles/rtkit-daemon b/apparmor.d/profiles-m-z/rtkit-daemon similarity index 100% rename from profiles/rtkit-daemon rename to apparmor.d/profiles-m-z/rtkit-daemon diff --git a/profiles/rtkitctl b/apparmor.d/profiles-m-z/rtkitctl similarity index 100% rename from profiles/rtkitctl rename to apparmor.d/profiles-m-z/rtkitctl diff --git a/profiles/run-parts b/apparmor.d/profiles-m-z/run-parts similarity index 100% rename from profiles/run-parts rename to apparmor.d/profiles-m-z/run-parts diff --git a/profiles/runuser b/apparmor.d/profiles-m-z/runuser similarity index 100% rename from profiles/runuser rename to apparmor.d/profiles-m-z/runuser diff --git a/profiles/scrot b/apparmor.d/profiles-m-z/scrot similarity index 100% rename from profiles/scrot rename to apparmor.d/profiles-m-z/scrot diff --git a/profiles/sddm b/apparmor.d/profiles-m-z/sddm similarity index 100% rename from profiles/sddm rename to apparmor.d/profiles-m-z/sddm diff --git a/profiles/sddm-greeter b/apparmor.d/profiles-m-z/sddm-greeter similarity index 100% rename from profiles/sddm-greeter rename to apparmor.d/profiles-m-z/sddm-greeter diff --git a/profiles/sddm-xsession b/apparmor.d/profiles-m-z/sddm-xsession similarity index 100% rename from profiles/sddm-xsession rename to apparmor.d/profiles-m-z/sddm-xsession diff --git a/profiles/sensors b/apparmor.d/profiles-m-z/sensors similarity index 100% rename from profiles/sensors rename to apparmor.d/profiles-m-z/sensors diff --git a/profiles/sensors-detect b/apparmor.d/profiles-m-z/sensors-detect similarity index 100% rename from profiles/sensors-detect rename to apparmor.d/profiles-m-z/sensors-detect diff --git a/profiles/setpci b/apparmor.d/profiles-m-z/setpci similarity index 100% rename from profiles/setpci rename to apparmor.d/profiles-m-z/setpci diff --git a/profiles/setpriv b/apparmor.d/profiles-m-z/setpriv similarity index 100% rename from profiles/setpriv rename to apparmor.d/profiles-m-z/setpriv diff --git a/profiles/sfdisk b/apparmor.d/profiles-m-z/sfdisk similarity index 100% rename from profiles/sfdisk rename to apparmor.d/profiles-m-z/sfdisk diff --git a/profiles/sgdisk b/apparmor.d/profiles-m-z/sgdisk similarity index 100% rename from profiles/sgdisk rename to apparmor.d/profiles-m-z/sgdisk diff --git a/profiles/smartctl b/apparmor.d/profiles-m-z/smartctl similarity index 100% rename from profiles/smartctl rename to apparmor.d/profiles-m-z/smartctl diff --git a/profiles/smartd b/apparmor.d/profiles-m-z/smartd similarity index 100% rename from profiles/smartd rename to apparmor.d/profiles-m-z/smartd diff --git a/profiles/smplayer b/apparmor.d/profiles-m-z/smplayer similarity index 100% rename from profiles/smplayer rename to apparmor.d/profiles-m-z/smplayer diff --git a/profiles/smtube b/apparmor.d/profiles-m-z/smtube similarity index 100% rename from profiles/smtube rename to apparmor.d/profiles-m-z/smtube diff --git a/profiles/spacefm b/apparmor.d/profiles-m-z/spacefm similarity index 100% rename from profiles/spacefm rename to apparmor.d/profiles-m-z/spacefm diff --git a/profiles/spacefm-auth b/apparmor.d/profiles-m-z/spacefm-auth similarity index 100% rename from profiles/spacefm-auth rename to apparmor.d/profiles-m-z/spacefm-auth diff --git a/profiles/spectre-meltdown-checker b/apparmor.d/profiles-m-z/spectre-meltdown-checker similarity index 100% rename from profiles/spectre-meltdown-checker rename to apparmor.d/profiles-m-z/spectre-meltdown-checker diff --git a/profiles/speedtest b/apparmor.d/profiles-m-z/speedtest similarity index 100% rename from profiles/speedtest rename to apparmor.d/profiles-m-z/speedtest diff --git a/profiles/spflashtool b/apparmor.d/profiles-m-z/spflashtool similarity index 100% rename from profiles/spflashtool rename to apparmor.d/profiles-m-z/spflashtool diff --git a/profiles/startx b/apparmor.d/profiles-m-z/startx similarity index 100% rename from profiles/startx rename to apparmor.d/profiles-m-z/startx diff --git a/profiles/strawberry b/apparmor.d/profiles-m-z/strawberry similarity index 100% rename from profiles/strawberry rename to apparmor.d/profiles-m-z/strawberry diff --git a/profiles/strawberry-tagreader b/apparmor.d/profiles-m-z/strawberry-tagreader similarity index 100% rename from profiles/strawberry-tagreader rename to apparmor.d/profiles-m-z/strawberry-tagreader diff --git a/profiles/su b/apparmor.d/profiles-m-z/su similarity index 100% rename from profiles/su rename to apparmor.d/profiles-m-z/su diff --git a/profiles/sudo b/apparmor.d/profiles-m-z/sudo similarity index 100% rename from profiles/sudo rename to apparmor.d/profiles-m-z/sudo diff --git a/profiles/suid3num b/apparmor.d/profiles-m-z/suid3num similarity index 100% rename from profiles/suid3num rename to apparmor.d/profiles-m-z/suid3num diff --git a/profiles/swaplabel b/apparmor.d/profiles-m-z/swaplabel similarity index 100% rename from profiles/swaplabel rename to apparmor.d/profiles-m-z/swaplabel diff --git a/profiles/swapoff b/apparmor.d/profiles-m-z/swapoff similarity index 100% rename from profiles/swapoff rename to apparmor.d/profiles-m-z/swapoff diff --git a/profiles/swapon b/apparmor.d/profiles-m-z/swapon similarity index 100% rename from profiles/swapon rename to apparmor.d/profiles-m-z/swapon diff --git a/profiles/syncthing b/apparmor.d/profiles-m-z/syncthing similarity index 100% rename from profiles/syncthing rename to apparmor.d/profiles-m-z/syncthing diff --git a/profiles/system-config-printer b/apparmor.d/profiles-m-z/system-config-printer similarity index 100% rename from profiles/system-config-printer rename to apparmor.d/profiles-m-z/system-config-printer diff --git a/profiles/system-config-printer-applet b/apparmor.d/profiles-m-z/system-config-printer-applet similarity index 100% rename from profiles/system-config-printer-applet rename to apparmor.d/profiles-m-z/system-config-printer-applet diff --git a/profiles/system_tor b/apparmor.d/profiles-m-z/system_tor similarity index 100% rename from profiles/system_tor rename to apparmor.d/profiles-m-z/system_tor diff --git a/profiles/tasksel b/apparmor.d/profiles-m-z/tasksel similarity index 100% rename from profiles/tasksel rename to apparmor.d/profiles-m-z/tasksel diff --git a/profiles/tftp b/apparmor.d/profiles-m-z/tftp similarity index 100% rename from profiles/tftp rename to apparmor.d/profiles-m-z/tftp diff --git a/profiles/thinkfan b/apparmor.d/profiles-m-z/thinkfan similarity index 100% rename from profiles/thinkfan rename to apparmor.d/profiles-m-z/thinkfan diff --git a/profiles/tint2 b/apparmor.d/profiles-m-z/tint2 similarity index 100% rename from profiles/tint2 rename to apparmor.d/profiles-m-z/tint2 diff --git a/profiles/tint2conf b/apparmor.d/profiles-m-z/tint2conf similarity index 100% rename from profiles/tint2conf rename to apparmor.d/profiles-m-z/tint2conf diff --git a/profiles/top b/apparmor.d/profiles-m-z/top similarity index 100% rename from profiles/top rename to apparmor.d/profiles-m-z/top diff --git a/profiles/torify b/apparmor.d/profiles-m-z/torify similarity index 100% rename from profiles/torify rename to apparmor.d/profiles-m-z/torify diff --git a/profiles/torsocks b/apparmor.d/profiles-m-z/torsocks similarity index 100% rename from profiles/torsocks rename to apparmor.d/profiles-m-z/torsocks diff --git a/profiles/tpacpi-bat b/apparmor.d/profiles-m-z/tpacpi-bat similarity index 100% rename from profiles/tpacpi-bat rename to apparmor.d/profiles-m-z/tpacpi-bat diff --git a/profiles/tune2fs b/apparmor.d/profiles-m-z/tune2fs similarity index 100% rename from profiles/tune2fs rename to apparmor.d/profiles-m-z/tune2fs diff --git a/profiles/ucf b/apparmor.d/profiles-m-z/ucf similarity index 100% rename from profiles/ucf rename to apparmor.d/profiles-m-z/ucf diff --git a/profiles/udevadm b/apparmor.d/profiles-m-z/udevadm similarity index 100% rename from profiles/udevadm rename to apparmor.d/profiles-m-z/udevadm diff --git a/profiles/udiskie b/apparmor.d/profiles-m-z/udiskie similarity index 100% rename from profiles/udiskie rename to apparmor.d/profiles-m-z/udiskie diff --git a/profiles/udiskie-info b/apparmor.d/profiles-m-z/udiskie-info similarity index 100% rename from profiles/udiskie-info rename to apparmor.d/profiles-m-z/udiskie-info diff --git a/profiles/udiskie-mount b/apparmor.d/profiles-m-z/udiskie-mount similarity index 100% rename from profiles/udiskie-mount rename to apparmor.d/profiles-m-z/udiskie-mount diff --git a/profiles/udiskie-umount b/apparmor.d/profiles-m-z/udiskie-umount similarity index 100% rename from profiles/udiskie-umount rename to apparmor.d/profiles-m-z/udiskie-umount diff --git a/profiles/udisksctl b/apparmor.d/profiles-m-z/udisksctl similarity index 100% rename from profiles/udisksctl rename to apparmor.d/profiles-m-z/udisksctl diff --git a/profiles/udisksd b/apparmor.d/profiles-m-z/udisksd similarity index 100% rename from profiles/udisksd rename to apparmor.d/profiles-m-z/udisksd diff --git a/profiles/umount b/apparmor.d/profiles-m-z/umount similarity index 100% rename from profiles/umount rename to apparmor.d/profiles-m-z/umount diff --git a/profiles/umount.udisks2 b/apparmor.d/profiles-m-z/umount.udisks2 similarity index 100% rename from profiles/umount.udisks2 rename to apparmor.d/profiles-m-z/umount.udisks2 diff --git a/profiles/uname b/apparmor.d/profiles-m-z/uname similarity index 100% rename from profiles/uname rename to apparmor.d/profiles-m-z/uname diff --git a/profiles/unhide-linux b/apparmor.d/profiles-m-z/unhide-linux similarity index 100% rename from profiles/unhide-linux rename to apparmor.d/profiles-m-z/unhide-linux diff --git a/profiles/unhide-posix b/apparmor.d/profiles-m-z/unhide-posix similarity index 100% rename from profiles/unhide-posix rename to apparmor.d/profiles-m-z/unhide-posix diff --git a/profiles/unhide-rb b/apparmor.d/profiles-m-z/unhide-rb similarity index 100% rename from profiles/unhide-rb rename to apparmor.d/profiles-m-z/unhide-rb diff --git a/profiles/unhide-tcp b/apparmor.d/profiles-m-z/unhide-tcp similarity index 100% rename from profiles/unhide-tcp rename to apparmor.d/profiles-m-z/unhide-tcp diff --git a/profiles/unix-chkpwd b/apparmor.d/profiles-m-z/unix-chkpwd similarity index 100% rename from profiles/unix-chkpwd rename to apparmor.d/profiles-m-z/unix-chkpwd diff --git a/profiles/unmkinitramfs b/apparmor.d/profiles-m-z/unmkinitramfs similarity index 100% rename from profiles/unmkinitramfs rename to apparmor.d/profiles-m-z/unmkinitramfs diff --git a/profiles/update-alternatives b/apparmor.d/profiles-m-z/update-alternatives similarity index 100% rename from profiles/update-alternatives rename to apparmor.d/profiles-m-z/update-alternatives diff --git a/profiles/update-ca-certificates b/apparmor.d/profiles-m-z/update-ca-certificates similarity index 100% rename from profiles/update-ca-certificates rename to apparmor.d/profiles-m-z/update-ca-certificates diff --git a/profiles/update-command-not-found b/apparmor.d/profiles-m-z/update-command-not-found similarity index 100% rename from profiles/update-command-not-found rename to apparmor.d/profiles-m-z/update-command-not-found diff --git a/profiles/update-desktop-database b/apparmor.d/profiles-m-z/update-desktop-database similarity index 100% rename from profiles/update-desktop-database rename to apparmor.d/profiles-m-z/update-desktop-database diff --git a/profiles/update-dlocatedb b/apparmor.d/profiles-m-z/update-dlocatedb similarity index 100% rename from profiles/update-dlocatedb rename to apparmor.d/profiles-m-z/update-dlocatedb diff --git a/profiles/update-initramfs b/apparmor.d/profiles-m-z/update-initramfs similarity index 100% rename from profiles/update-initramfs rename to apparmor.d/profiles-m-z/update-initramfs diff --git a/profiles/update-pciids b/apparmor.d/profiles-m-z/update-pciids similarity index 100% rename from profiles/update-pciids rename to apparmor.d/profiles-m-z/update-pciids diff --git a/profiles/update-smart-drivedb b/apparmor.d/profiles-m-z/update-smart-drivedb similarity index 100% rename from profiles/update-smart-drivedb rename to apparmor.d/profiles-m-z/update-smart-drivedb diff --git a/profiles/updatedb-mlocate b/apparmor.d/profiles-m-z/updatedb-mlocate similarity index 100% rename from profiles/updatedb-mlocate rename to apparmor.d/profiles-m-z/updatedb-mlocate diff --git a/profiles/upower b/apparmor.d/profiles-m-z/upower similarity index 100% rename from profiles/upower rename to apparmor.d/profiles-m-z/upower diff --git a/profiles/upowerd b/apparmor.d/profiles-m-z/upowerd similarity index 100% rename from profiles/upowerd rename to apparmor.d/profiles-m-z/upowerd diff --git a/profiles/uptime b/apparmor.d/profiles-m-z/uptime similarity index 100% rename from profiles/uptime rename to apparmor.d/profiles-m-z/uptime diff --git a/profiles/usb-devices b/apparmor.d/profiles-m-z/usb-devices similarity index 100% rename from profiles/usb-devices rename to apparmor.d/profiles-m-z/usb-devices diff --git a/profiles/usbguard b/apparmor.d/profiles-m-z/usbguard similarity index 100% rename from profiles/usbguard rename to apparmor.d/profiles-m-z/usbguard diff --git a/profiles/usbguard-applet-qt b/apparmor.d/profiles-m-z/usbguard-applet-qt similarity index 100% rename from profiles/usbguard-applet-qt rename to apparmor.d/profiles-m-z/usbguard-applet-qt diff --git a/profiles/usbguard-daemon b/apparmor.d/profiles-m-z/usbguard-daemon similarity index 100% rename from profiles/usbguard-daemon rename to apparmor.d/profiles-m-z/usbguard-daemon diff --git a/profiles/usbguard-dbus b/apparmor.d/profiles-m-z/usbguard-dbus similarity index 100% rename from profiles/usbguard-dbus rename to apparmor.d/profiles-m-z/usbguard-dbus diff --git a/profiles/uscan b/apparmor.d/profiles-m-z/uscan similarity index 100% rename from profiles/uscan rename to apparmor.d/profiles-m-z/uscan diff --git a/profiles/useradd b/apparmor.d/profiles-m-z/useradd similarity index 100% rename from profiles/useradd rename to apparmor.d/profiles-m-z/useradd diff --git a/profiles/userdel b/apparmor.d/profiles-m-z/userdel similarity index 100% rename from profiles/userdel rename to apparmor.d/profiles-m-z/userdel diff --git a/profiles/usermod b/apparmor.d/profiles-m-z/usermod similarity index 100% rename from profiles/usermod rename to apparmor.d/profiles-m-z/usermod diff --git a/profiles/usr.bin.irssi b/apparmor.d/profiles-m-z/usr.bin.irssi similarity index 100% rename from profiles/usr.bin.irssi rename to apparmor.d/profiles-m-z/usr.bin.irssi diff --git a/profiles/usr.bin.lxc-start b/apparmor.d/profiles-m-z/usr.bin.lxc-start similarity index 100% rename from profiles/usr.bin.lxc-start rename to apparmor.d/profiles-m-z/usr.bin.lxc-start diff --git a/profiles/usr.bin.man b/apparmor.d/profiles-m-z/usr.bin.man similarity index 100% rename from profiles/usr.bin.man rename to apparmor.d/profiles-m-z/usr.bin.man diff --git a/profiles/usr.bin.pidgin b/apparmor.d/profiles-m-z/usr.bin.pidgin similarity index 100% rename from profiles/usr.bin.pidgin rename to apparmor.d/profiles-m-z/usr.bin.pidgin diff --git a/profiles/usr.bin.tcpdump b/apparmor.d/profiles-m-z/usr.bin.tcpdump similarity index 100% rename from profiles/usr.bin.tcpdump rename to apparmor.d/profiles-m-z/usr.bin.tcpdump diff --git a/profiles/usr.bin.totem b/apparmor.d/profiles-m-z/usr.bin.totem similarity index 100% rename from profiles/usr.bin.totem rename to apparmor.d/profiles-m-z/usr.bin.totem diff --git a/profiles/usr.bin.totem-previewers b/apparmor.d/profiles-m-z/usr.bin.totem-previewers similarity index 100% rename from profiles/usr.bin.totem-previewers rename to apparmor.d/profiles-m-z/usr.bin.totem-previewers diff --git a/profiles/usr.lib.libvirt.virt-aa-helper b/apparmor.d/profiles-m-z/usr.lib.libvirt.virt-aa-helper similarity index 100% rename from profiles/usr.lib.libvirt.virt-aa-helper rename to apparmor.d/profiles-m-z/usr.lib.libvirt.virt-aa-helper diff --git a/profiles/usr.sbin.cupsd b/apparmor.d/profiles-m-z/usr.sbin.cupsd similarity index 100% rename from profiles/usr.sbin.cupsd rename to apparmor.d/profiles-m-z/usr.sbin.cupsd diff --git a/profiles/usr.sbin.libvirtd b/apparmor.d/profiles-m-z/usr.sbin.libvirtd similarity index 100% rename from profiles/usr.sbin.libvirtd rename to apparmor.d/profiles-m-z/usr.sbin.libvirtd diff --git a/profiles/utmpdump b/apparmor.d/profiles-m-z/utmpdump similarity index 100% rename from profiles/utmpdump rename to apparmor.d/profiles-m-z/utmpdump diff --git a/profiles/uupdate b/apparmor.d/profiles-m-z/uupdate similarity index 100% rename from profiles/uupdate rename to apparmor.d/profiles-m-z/uupdate diff --git a/profiles/vcsi b/apparmor.d/profiles-m-z/vcsi similarity index 100% rename from profiles/vcsi rename to apparmor.d/profiles-m-z/vcsi diff --git a/profiles/vidcutter b/apparmor.d/profiles-m-z/vidcutter similarity index 100% rename from profiles/vidcutter rename to apparmor.d/profiles-m-z/vidcutter diff --git a/profiles/vipw-vigr b/apparmor.d/profiles-m-z/vipw-vigr similarity index 100% rename from profiles/vipw-vigr rename to apparmor.d/profiles-m-z/vipw-vigr diff --git a/profiles/virt-manager b/apparmor.d/profiles-m-z/virt-manager similarity index 100% rename from profiles/virt-manager rename to apparmor.d/profiles-m-z/virt-manager diff --git a/profiles/vnstat b/apparmor.d/profiles-m-z/vnstat similarity index 100% rename from profiles/vnstat rename to apparmor.d/profiles-m-z/vnstat diff --git a/profiles/vnstatd b/apparmor.d/profiles-m-z/vnstatd similarity index 100% rename from profiles/vnstatd rename to apparmor.d/profiles-m-z/vnstatd diff --git a/profiles/volumeicon b/apparmor.d/profiles-m-z/volumeicon similarity index 100% rename from profiles/volumeicon rename to apparmor.d/profiles-m-z/volumeicon diff --git a/profiles/vsftpd b/apparmor.d/profiles-m-z/vsftpd similarity index 100% rename from profiles/vsftpd rename to apparmor.d/profiles-m-z/vsftpd diff --git a/profiles/w b/apparmor.d/profiles-m-z/w similarity index 100% rename from profiles/w rename to apparmor.d/profiles-m-z/w diff --git a/profiles/wavemon b/apparmor.d/profiles-m-z/wavemon similarity index 100% rename from profiles/wavemon rename to apparmor.d/profiles-m-z/wavemon diff --git a/profiles/wget b/apparmor.d/profiles-m-z/wget similarity index 100% rename from profiles/wget rename to apparmor.d/profiles-m-z/wget diff --git a/profiles/whdd b/apparmor.d/profiles-m-z/whdd similarity index 100% rename from profiles/whdd rename to apparmor.d/profiles-m-z/whdd diff --git a/profiles/whiptail b/apparmor.d/profiles-m-z/whiptail similarity index 100% rename from profiles/whiptail rename to apparmor.d/profiles-m-z/whiptail diff --git a/profiles/who b/apparmor.d/profiles-m-z/who similarity index 100% rename from profiles/who rename to apparmor.d/profiles-m-z/who diff --git a/profiles/wireshark b/apparmor.d/profiles-m-z/wireshark similarity index 100% rename from profiles/wireshark rename to apparmor.d/profiles-m-z/wireshark diff --git a/profiles/wmctrl b/apparmor.d/profiles-m-z/wmctrl similarity index 100% rename from profiles/wmctrl rename to apparmor.d/profiles-m-z/wmctrl diff --git a/profiles/wpa-gui b/apparmor.d/profiles-m-z/wpa-gui similarity index 100% rename from profiles/wpa-gui rename to apparmor.d/profiles-m-z/wpa-gui diff --git a/profiles/wpa-supplicant b/apparmor.d/profiles-m-z/wpa-supplicant similarity index 100% rename from profiles/wpa-supplicant rename to apparmor.d/profiles-m-z/wpa-supplicant diff --git a/profiles/wpa_cli b/apparmor.d/profiles-m-z/wpa_cli similarity index 100% rename from profiles/wpa_cli rename to apparmor.d/profiles-m-z/wpa_cli diff --git a/profiles/wrmsr b/apparmor.d/profiles-m-z/wrmsr similarity index 100% rename from profiles/wrmsr rename to apparmor.d/profiles-m-z/wrmsr diff --git a/profiles/x11-xsession b/apparmor.d/profiles-m-z/x11-xsession similarity index 100% rename from profiles/x11-xsession rename to apparmor.d/profiles-m-z/x11-xsession diff --git a/profiles/xarchiver b/apparmor.d/profiles-m-z/xarchiver similarity index 100% rename from profiles/xarchiver rename to apparmor.d/profiles-m-z/xarchiver diff --git a/profiles/xauth b/apparmor.d/profiles-m-z/xauth similarity index 100% rename from profiles/xauth rename to apparmor.d/profiles-m-z/xauth diff --git a/profiles/xautolock b/apparmor.d/profiles-m-z/xautolock similarity index 100% rename from profiles/xautolock rename to apparmor.d/profiles-m-z/xautolock diff --git a/profiles/xbacklight b/apparmor.d/profiles-m-z/xbacklight similarity index 100% rename from profiles/xbacklight rename to apparmor.d/profiles-m-z/xbacklight diff --git a/profiles/xdg-desktop-menu b/apparmor.d/profiles-m-z/xdg-desktop-menu similarity index 100% rename from profiles/xdg-desktop-menu rename to apparmor.d/profiles-m-z/xdg-desktop-menu diff --git a/profiles/xdg-email b/apparmor.d/profiles-m-z/xdg-email similarity index 100% rename from profiles/xdg-email rename to apparmor.d/profiles-m-z/xdg-email diff --git a/profiles/xdg-icon-resource b/apparmor.d/profiles-m-z/xdg-icon-resource similarity index 100% rename from profiles/xdg-icon-resource rename to apparmor.d/profiles-m-z/xdg-icon-resource diff --git a/profiles/xdg-mime b/apparmor.d/profiles-m-z/xdg-mime similarity index 100% rename from profiles/xdg-mime rename to apparmor.d/profiles-m-z/xdg-mime diff --git a/profiles/xdg-open b/apparmor.d/profiles-m-z/xdg-open similarity index 100% rename from profiles/xdg-open rename to apparmor.d/profiles-m-z/xdg-open diff --git a/profiles/xdg-screensaver b/apparmor.d/profiles-m-z/xdg-screensaver similarity index 100% rename from profiles/xdg-screensaver rename to apparmor.d/profiles-m-z/xdg-screensaver diff --git a/profiles/xdg-settings b/apparmor.d/profiles-m-z/xdg-settings similarity index 100% rename from profiles/xdg-settings rename to apparmor.d/profiles-m-z/xdg-settings diff --git a/profiles/xdpyinfo b/apparmor.d/profiles-m-z/xdpyinfo similarity index 100% rename from profiles/xdpyinfo rename to apparmor.d/profiles-m-z/xdpyinfo diff --git a/profiles/xfce4-notifyd b/apparmor.d/profiles-m-z/xfce4-notifyd similarity index 100% rename from profiles/xfce4-notifyd rename to apparmor.d/profiles-m-z/xfce4-notifyd diff --git a/profiles/xfconfd b/apparmor.d/profiles-m-z/xfconfd similarity index 100% rename from profiles/xfconfd rename to apparmor.d/profiles-m-z/xfconfd diff --git a/profiles/xhost b/apparmor.d/profiles-m-z/xhost similarity index 100% rename from profiles/xhost rename to apparmor.d/profiles-m-z/xhost diff --git a/profiles/xinit b/apparmor.d/profiles-m-z/xinit similarity index 100% rename from profiles/xinit rename to apparmor.d/profiles-m-z/xinit diff --git a/profiles/xinput b/apparmor.d/profiles-m-z/xinput similarity index 100% rename from profiles/xinput rename to apparmor.d/profiles-m-z/xinput diff --git a/profiles/xkbcomp b/apparmor.d/profiles-m-z/xkbcomp similarity index 100% rename from profiles/xkbcomp rename to apparmor.d/profiles-m-z/xkbcomp diff --git a/profiles/xorg b/apparmor.d/profiles-m-z/xorg similarity index 100% rename from profiles/xorg rename to apparmor.d/profiles-m-z/xorg diff --git a/profiles/xprop b/apparmor.d/profiles-m-z/xprop similarity index 100% rename from profiles/xprop rename to apparmor.d/profiles-m-z/xprop diff --git a/profiles/xrandr b/apparmor.d/profiles-m-z/xrandr similarity index 100% rename from profiles/xrandr rename to apparmor.d/profiles-m-z/xrandr diff --git a/profiles/xrdb b/apparmor.d/profiles-m-z/xrdb similarity index 100% rename from profiles/xrdb rename to apparmor.d/profiles-m-z/xrdb diff --git a/profiles/xsel b/apparmor.d/profiles-m-z/xsel similarity index 100% rename from profiles/xsel rename to apparmor.d/profiles-m-z/xsel diff --git a/profiles/xset b/apparmor.d/profiles-m-z/xset similarity index 100% rename from profiles/xset rename to apparmor.d/profiles-m-z/xset diff --git a/profiles/xsetroot b/apparmor.d/profiles-m-z/xsetroot similarity index 100% rename from profiles/xsetroot rename to apparmor.d/profiles-m-z/xsetroot diff --git a/profiles/youtube-dl b/apparmor.d/profiles-m-z/youtube-dl similarity index 100% rename from profiles/youtube-dl rename to apparmor.d/profiles-m-z/youtube-dl diff --git a/profiles/youtube-viewer b/apparmor.d/profiles-m-z/youtube-viewer similarity index 100% rename from profiles/youtube-viewer rename to apparmor.d/profiles-m-z/youtube-viewer diff --git a/profiles/ytdl b/apparmor.d/profiles-m-z/ytdl similarity index 100% rename from profiles/ytdl rename to apparmor.d/profiles-m-z/ytdl diff --git a/profiles/zenmap b/apparmor.d/profiles-m-z/zenmap similarity index 100% rename from profiles/zenmap rename to apparmor.d/profiles-m-z/zenmap diff --git a/profiles/tunables/xdg-user-dirs.d/complete b/apparmor.d/tunables/xdg-user-dirs.d/complete similarity index 100% rename from profiles/tunables/xdg-user-dirs.d/complete rename to apparmor.d/tunables/xdg-user-dirs.d/complete