diff --git a/apparmor.d/profiles-a-f/aa-enabled b/apparmor.d/groups/apparmor/aa-enabled
similarity index 100%
rename from apparmor.d/profiles-a-f/aa-enabled
rename to apparmor.d/groups/apparmor/aa-enabled
diff --git a/apparmor.d/profiles-a-f/aa-enforce b/apparmor.d/groups/apparmor/aa-enforce
similarity index 100%
rename from apparmor.d/profiles-a-f/aa-enforce
rename to apparmor.d/groups/apparmor/aa-enforce
diff --git a/apparmor.d/profiles-a-f/aa-log b/apparmor.d/groups/apparmor/aa-log
similarity index 100%
rename from apparmor.d/profiles-a-f/aa-log
rename to apparmor.d/groups/apparmor/aa-log
diff --git a/apparmor.d/profiles-a-f/aa-notify b/apparmor.d/groups/apparmor/aa-notify
similarity index 100%
rename from apparmor.d/profiles-a-f/aa-notify
rename to apparmor.d/groups/apparmor/aa-notify
diff --git a/apparmor.d/profiles-a-f/aa-status b/apparmor.d/groups/apparmor/aa-status
similarity index 100%
rename from apparmor.d/profiles-a-f/aa-status
rename to apparmor.d/groups/apparmor/aa-status
diff --git a/apparmor.d/profiles-a-f/aa-teardown b/apparmor.d/groups/apparmor/aa-teardown
similarity index 100%
rename from apparmor.d/profiles-a-f/aa-teardown
rename to apparmor.d/groups/apparmor/aa-teardown
diff --git a/apparmor.d/profiles-a-f/aa-unconfined b/apparmor.d/groups/apparmor/aa-unconfined
similarity index 100%
rename from apparmor.d/profiles-a-f/aa-unconfined
rename to apparmor.d/groups/apparmor/aa-unconfined
diff --git a/apparmor.d/profiles-a-f/apparmor.systemd b/apparmor.d/groups/apparmor/apparmor.systemd
similarity index 100%
rename from apparmor.d/profiles-a-f/apparmor.systemd
rename to apparmor.d/groups/apparmor/apparmor.systemd
diff --git a/apparmor.d/profiles-a-f/apparmor_parser b/apparmor.d/groups/apparmor/apparmor_parser
similarity index 100%
rename from apparmor.d/profiles-a-f/apparmor_parser
rename to apparmor.d/groups/apparmor/apparmor_parser
diff --git a/apparmor.d/profiles-a-f/cups-backend-beh b/apparmor.d/groups/cups/cups-backend-beh
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-beh
rename to apparmor.d/groups/cups/cups-backend-beh
diff --git a/apparmor.d/profiles-a-f/cups-backend-bluetooth b/apparmor.d/groups/cups/cups-backend-bluetooth
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-bluetooth
rename to apparmor.d/groups/cups/cups-backend-bluetooth
diff --git a/apparmor.d/profiles-a-f/cups-backend-brf b/apparmor.d/groups/cups/cups-backend-brf
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-brf
rename to apparmor.d/groups/cups/cups-backend-brf
diff --git a/apparmor.d/profiles-a-f/cups-backend-dnssd b/apparmor.d/groups/cups/cups-backend-dnssd
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-dnssd
rename to apparmor.d/groups/cups/cups-backend-dnssd
diff --git a/apparmor.d/profiles-a-f/cups-backend-hp b/apparmor.d/groups/cups/cups-backend-hp
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-hp
rename to apparmor.d/groups/cups/cups-backend-hp
diff --git a/apparmor.d/profiles-a-f/cups-backend-implicitclass b/apparmor.d/groups/cups/cups-backend-implicitclass
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-implicitclass
rename to apparmor.d/groups/cups/cups-backend-implicitclass
diff --git a/apparmor.d/profiles-a-f/cups-backend-ipp b/apparmor.d/groups/cups/cups-backend-ipp
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-ipp
rename to apparmor.d/groups/cups/cups-backend-ipp
diff --git a/apparmor.d/profiles-a-f/cups-backend-lpd b/apparmor.d/groups/cups/cups-backend-lpd
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-lpd
rename to apparmor.d/groups/cups/cups-backend-lpd
diff --git a/apparmor.d/profiles-a-f/cups-backend-mdns b/apparmor.d/groups/cups/cups-backend-mdns
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-mdns
rename to apparmor.d/groups/cups/cups-backend-mdns
diff --git a/apparmor.d/profiles-a-f/cups-backend-parallel b/apparmor.d/groups/cups/cups-backend-parallel
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-parallel
rename to apparmor.d/groups/cups/cups-backend-parallel
diff --git a/apparmor.d/profiles-a-f/cups-backend-pdf b/apparmor.d/groups/cups/cups-backend-pdf
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-pdf
rename to apparmor.d/groups/cups/cups-backend-pdf
diff --git a/apparmor.d/profiles-a-f/cups-backend-serial b/apparmor.d/groups/cups/cups-backend-serial
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-serial
rename to apparmor.d/groups/cups/cups-backend-serial
diff --git a/apparmor.d/profiles-a-f/cups-backend-snmp b/apparmor.d/groups/cups/cups-backend-snmp
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-snmp
rename to apparmor.d/groups/cups/cups-backend-snmp
diff --git a/apparmor.d/profiles-a-f/cups-backend-socket b/apparmor.d/groups/cups/cups-backend-socket
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-socket
rename to apparmor.d/groups/cups/cups-backend-socket
diff --git a/apparmor.d/profiles-a-f/cups-backend-usb b/apparmor.d/groups/cups/cups-backend-usb
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-backend-usb
rename to apparmor.d/groups/cups/cups-backend-usb
diff --git a/apparmor.d/profiles-a-f/cups-browsed b/apparmor.d/groups/cups/cups-browsed
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-browsed
rename to apparmor.d/groups/cups/cups-browsed
diff --git a/apparmor.d/profiles-a-f/cups-notifier-dbus b/apparmor.d/groups/cups/cups-notifier-dbus
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-notifier-dbus
rename to apparmor.d/groups/cups/cups-notifier-dbus
diff --git a/apparmor.d/profiles-a-f/cups-notifier-mailto b/apparmor.d/groups/cups/cups-notifier-mailto
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-notifier-mailto
rename to apparmor.d/groups/cups/cups-notifier-mailto
diff --git a/apparmor.d/profiles-a-f/cups-notifier-rss b/apparmor.d/groups/cups/cups-notifier-rss
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-notifier-rss
rename to apparmor.d/groups/cups/cups-notifier-rss
diff --git a/apparmor.d/profiles-a-f/cups-pk-helper-mechanism b/apparmor.d/groups/cups/cups-pk-helper-mechanism
similarity index 100%
rename from apparmor.d/profiles-a-f/cups-pk-helper-mechanism
rename to apparmor.d/groups/cups/cups-pk-helper-mechanism
diff --git a/apparmor.d/profiles-a-f/cupsd b/apparmor.d/groups/cups/cupsd
similarity index 100%
rename from apparmor.d/profiles-a-f/cupsd
rename to apparmor.d/groups/cups/cupsd
diff --git a/apparmor.d/profiles-a-f/flatpak b/apparmor.d/groups/flatpak/flatpak
similarity index 100%
rename from apparmor.d/profiles-a-f/flatpak
rename to apparmor.d/groups/flatpak/flatpak
diff --git a/apparmor.d/profiles-a-f/flatpak-app b/apparmor.d/groups/flatpak/flatpak-app
similarity index 100%
rename from apparmor.d/profiles-a-f/flatpak-app
rename to apparmor.d/groups/flatpak/flatpak-app
diff --git a/apparmor.d/profiles-a-f/flatpak-oci-authenticator b/apparmor.d/groups/flatpak/flatpak-oci-authenticator
similarity index 100%
rename from apparmor.d/profiles-a-f/flatpak-oci-authenticator
rename to apparmor.d/groups/flatpak/flatpak-oci-authenticator
diff --git a/apparmor.d/profiles-a-f/flatpak-portal b/apparmor.d/groups/flatpak/flatpak-portal
similarity index 100%
rename from apparmor.d/profiles-a-f/flatpak-portal
rename to apparmor.d/groups/flatpak/flatpak-portal
diff --git a/apparmor.d/profiles-a-f/flatpak-session-helper b/apparmor.d/groups/flatpak/flatpak-session-helper
similarity index 100%
rename from apparmor.d/profiles-a-f/flatpak-session-helper
rename to apparmor.d/groups/flatpak/flatpak-session-helper
diff --git a/apparmor.d/profiles-a-f/flatpak-system-helper b/apparmor.d/groups/flatpak/flatpak-system-helper
similarity index 100%
rename from apparmor.d/profiles-a-f/flatpak-system-helper
rename to apparmor.d/groups/flatpak/flatpak-system-helper
diff --git a/apparmor.d/profiles-a-f/flatpak-validate-icon b/apparmor.d/groups/flatpak/flatpak-validate-icon
similarity index 100%
rename from apparmor.d/profiles-a-f/flatpak-validate-icon
rename to apparmor.d/groups/flatpak/flatpak-validate-icon
diff --git a/apparmor.d/profiles-s-z/snap b/apparmor.d/groups/snap/snap
similarity index 100%
rename from apparmor.d/profiles-s-z/snap
rename to apparmor.d/groups/snap/snap
diff --git a/apparmor.d/profiles-s-z/snap-bootstrap b/apparmor.d/groups/snap/snap-bootstrap
similarity index 100%
rename from apparmor.d/profiles-s-z/snap-bootstrap
rename to apparmor.d/groups/snap/snap-bootstrap
diff --git a/apparmor.d/profiles-s-z/snap-device-helper b/apparmor.d/groups/snap/snap-device-helper
similarity index 100%
rename from apparmor.d/profiles-s-z/snap-device-helper
rename to apparmor.d/groups/snap/snap-device-helper
diff --git a/apparmor.d/profiles-s-z/snap-discard-ns b/apparmor.d/groups/snap/snap-discard-ns
similarity index 100%
rename from apparmor.d/profiles-s-z/snap-discard-ns
rename to apparmor.d/groups/snap/snap-discard-ns
diff --git a/apparmor.d/profiles-s-z/snap-failure b/apparmor.d/groups/snap/snap-failure
similarity index 100%
rename from apparmor.d/profiles-s-z/snap-failure
rename to apparmor.d/groups/snap/snap-failure
diff --git a/apparmor.d/profiles-s-z/snap-repair b/apparmor.d/groups/snap/snap-repair
similarity index 100%
rename from apparmor.d/profiles-s-z/snap-repair
rename to apparmor.d/groups/snap/snap-repair
diff --git a/apparmor.d/profiles-s-z/snap-seccomp b/apparmor.d/groups/snap/snap-seccomp
similarity index 100%
rename from apparmor.d/profiles-s-z/snap-seccomp
rename to apparmor.d/groups/snap/snap-seccomp
diff --git a/apparmor.d/profiles-s-z/snap-update-ns b/apparmor.d/groups/snap/snap-update-ns
similarity index 100%
rename from apparmor.d/profiles-s-z/snap-update-ns
rename to apparmor.d/groups/snap/snap-update-ns
diff --git a/apparmor.d/profiles-s-z/snapd b/apparmor.d/groups/snap/snapd
similarity index 100%
rename from apparmor.d/profiles-s-z/snapd
rename to apparmor.d/groups/snap/snapd
diff --git a/apparmor.d/profiles-s-z/snapd-aa-prompt-listener b/apparmor.d/groups/snap/snapd-aa-prompt-listener
similarity index 100%
rename from apparmor.d/profiles-s-z/snapd-aa-prompt-listener
rename to apparmor.d/groups/snap/snapd-aa-prompt-listener
diff --git a/apparmor.d/profiles-s-z/snapd-aa-prompt-ui b/apparmor.d/groups/snap/snapd-aa-prompt-ui
similarity index 100%
rename from apparmor.d/profiles-s-z/snapd-aa-prompt-ui
rename to apparmor.d/groups/snap/snapd-aa-prompt-ui
diff --git a/apparmor.d/profiles-s-z/snapd-apparmor b/apparmor.d/groups/snap/snapd-apparmor
similarity index 100%
rename from apparmor.d/profiles-s-z/snapd-apparmor
rename to apparmor.d/groups/snap/snapd-apparmor
diff --git a/apparmor.d/profiles-s-z/snapd-core-fixup b/apparmor.d/groups/snap/snapd-core-fixup
similarity index 100%
rename from apparmor.d/profiles-s-z/snapd-core-fixup
rename to apparmor.d/groups/snap/snapd-core-fixup
diff --git a/apparmor.d/profiles-s-z/steam b/apparmor.d/groups/steam/steam
similarity index 100%
rename from apparmor.d/profiles-s-z/steam
rename to apparmor.d/groups/steam/steam
diff --git a/apparmor.d/profiles-s-z/steam-fossilize b/apparmor.d/groups/steam/steam-fossilize
similarity index 100%
rename from apparmor.d/profiles-s-z/steam-fossilize
rename to apparmor.d/groups/steam/steam-fossilize
diff --git a/apparmor.d/profiles-s-z/steam-game-native b/apparmor.d/groups/steam/steam-game-native
similarity index 100%
rename from apparmor.d/profiles-s-z/steam-game-native
rename to apparmor.d/groups/steam/steam-game-native
diff --git a/apparmor.d/profiles-s-z/steam-game-proton b/apparmor.d/groups/steam/steam-game-proton
similarity index 100%
rename from apparmor.d/profiles-s-z/steam-game-proton
rename to apparmor.d/groups/steam/steam-game-proton
diff --git a/apparmor.d/profiles-s-z/steam-gameoverlayui b/apparmor.d/groups/steam/steam-gameoverlayui
similarity index 100%
rename from apparmor.d/profiles-s-z/steam-gameoverlayui
rename to apparmor.d/groups/steam/steam-gameoverlayui
diff --git a/apparmor.d/profiles-s-z/steam-launch b/apparmor.d/groups/steam/steam-launch
similarity index 100%
rename from apparmor.d/profiles-s-z/steam-launch
rename to apparmor.d/groups/steam/steam-launch
diff --git a/apparmor.d/profiles-s-z/steam-launcher b/apparmor.d/groups/steam/steam-launcher
similarity index 100%
rename from apparmor.d/profiles-s-z/steam-launcher
rename to apparmor.d/groups/steam/steam-launcher
diff --git a/apparmor.d/profiles-s-z/steam-runtime b/apparmor.d/groups/steam/steam-runtime
similarity index 100%
rename from apparmor.d/profiles-s-z/steam-runtime
rename to apparmor.d/groups/steam/steam-runtime
diff --git a/apparmor.d/profiles-s-z/steam-runtime-steam-remote b/apparmor.d/groups/steam/steam-runtime-steam-remote
similarity index 100%
rename from apparmor.d/profiles-s-z/steam-runtime-steam-remote
rename to apparmor.d/groups/steam/steam-runtime-steam-remote
diff --git a/apparmor.d/profiles-s-z/steamerrorreporter b/apparmor.d/groups/steam/steamerrorreporter
similarity index 100%
rename from apparmor.d/profiles-s-z/steamerrorreporter
rename to apparmor.d/groups/steam/steamerrorreporter
diff --git a/dists/ignore/main.ignore b/dists/ignore/main.ignore
index 917b117f1..3cccf4c05 100644
--- a/dists/ignore/main.ignore
+++ b/dists/ignore/main.ignore
@@ -9,14 +9,6 @@ apparmor.d/groups/_full
 man
 
 # Work in progress profiles
+apparmor.d/groups/steam
 dunst
 plasma-discover
-steam
-steam-fossilize
-steam-game-native
-steam-game-proton
-steam-gameoverlayui
-steam-launch
-steam-launcher
-steam-runtime
-steamerrorreporter