diff --git a/apparmor.d/profiles-a-f/blueman b/apparmor.d/groups/bluetooth/blueman
similarity index 100%
rename from apparmor.d/profiles-a-f/blueman
rename to apparmor.d/groups/bluetooth/blueman
diff --git a/apparmor.d/profiles-a-f/blueman-mechanism b/apparmor.d/groups/bluetooth/blueman-mechanism
similarity index 100%
rename from apparmor.d/profiles-a-f/blueman-mechanism
rename to apparmor.d/groups/bluetooth/blueman-mechanism
diff --git a/apparmor.d/profiles-a-f/blueman-rfcomm-watcher b/apparmor.d/groups/bluetooth/blueman-rfcomm-watcher
similarity index 86%
rename from apparmor.d/profiles-a-f/blueman-rfcomm-watcher
rename to apparmor.d/groups/bluetooth/blueman-rfcomm-watcher
index 516f14bdd..639e475ac 100644
--- a/apparmor.d/profiles-a-f/blueman-rfcomm-watcher
+++ b/apparmor.d/groups/bluetooth/blueman-rfcomm-watcher
@@ -7,7 +7,7 @@ abi <abi/4.0>,
 
 include <tunables/global>
 
-@{exec_path} = @{lib}/blueman-rfcomm-watcher
+@{exec_path} = @{lib}/blueman-mechanism @{lib}/blueman/blueman-rfcomm-watcher
 profile blueman-rfcomm-watcher @{exec_path} {
   include <abstractions/base>
   include <abstractions/python>
diff --git a/apparmor.d/profiles-a-f/bluemoon b/apparmor.d/groups/bluetooth/bluemoon
similarity index 100%
rename from apparmor.d/profiles-a-f/bluemoon
rename to apparmor.d/groups/bluetooth/bluemoon
diff --git a/apparmor.d/profiles-a-f/bluetoothctl b/apparmor.d/groups/bluetooth/bluetoothctl
similarity index 100%
rename from apparmor.d/profiles-a-f/bluetoothctl
rename to apparmor.d/groups/bluetooth/bluetoothctl
diff --git a/apparmor.d/profiles-a-f/bluetoothd b/apparmor.d/groups/bluetooth/bluetoothd
similarity index 100%
rename from apparmor.d/profiles-a-f/bluetoothd
rename to apparmor.d/groups/bluetooth/bluetoothd
diff --git a/apparmor.d/profiles-m-r/obex-folder-listing b/apparmor.d/groups/bluetooth/obex-folder-listing
similarity index 100%
rename from apparmor.d/profiles-m-r/obex-folder-listing
rename to apparmor.d/groups/bluetooth/obex-folder-listing
diff --git a/apparmor.d/profiles-m-r/obexautofs b/apparmor.d/groups/bluetooth/obexautofs
similarity index 100%
rename from apparmor.d/profiles-m-r/obexautofs
rename to apparmor.d/groups/bluetooth/obexautofs
diff --git a/apparmor.d/profiles-m-r/obexctl b/apparmor.d/groups/bluetooth/obexctl
similarity index 100%
rename from apparmor.d/profiles-m-r/obexctl
rename to apparmor.d/groups/bluetooth/obexctl
diff --git a/apparmor.d/profiles-m-r/obexd b/apparmor.d/groups/bluetooth/obexd
similarity index 100%
rename from apparmor.d/profiles-m-r/obexd
rename to apparmor.d/groups/bluetooth/obexd
diff --git a/apparmor.d/profiles-m-r/obexfs b/apparmor.d/groups/bluetooth/obexfs
similarity index 100%
rename from apparmor.d/profiles-m-r/obexfs
rename to apparmor.d/groups/bluetooth/obexfs
diff --git a/apparmor.d/profiles-m-r/obexpush-atd b/apparmor.d/groups/bluetooth/obexpush-atd
similarity index 100%
rename from apparmor.d/profiles-m-r/obexpush-atd
rename to apparmor.d/groups/bluetooth/obexpush-atd
diff --git a/apparmor.d/profiles-m-r/obexpushd b/apparmor.d/groups/bluetooth/obexpushd
similarity index 100%
rename from apparmor.d/profiles-m-r/obexpushd
rename to apparmor.d/groups/bluetooth/obexpushd
diff --git a/apparmor.d/profiles-m-r/mke2fs b/apparmor.d/groups/filesystem/mke2fs
similarity index 100%
rename from apparmor.d/profiles-m-r/mke2fs
rename to apparmor.d/groups/filesystem/mke2fs
diff --git a/apparmor.d/profiles-m-r/mkfs-btrfs b/apparmor.d/groups/filesystem/mkfs-btrfs
similarity index 100%
rename from apparmor.d/profiles-m-r/mkfs-btrfs
rename to apparmor.d/groups/filesystem/mkfs-btrfs
diff --git a/apparmor.d/profiles-m-r/mkfs-fat b/apparmor.d/groups/filesystem/mkfs-fat
similarity index 100%
rename from apparmor.d/profiles-m-r/mkfs-fat
rename to apparmor.d/groups/filesystem/mkfs-fat
diff --git a/apparmor.d/profiles-m-r/mkntfs b/apparmor.d/groups/filesystem/mkntfs
similarity index 100%
rename from apparmor.d/profiles-m-r/mkntfs
rename to apparmor.d/groups/filesystem/mkntfs
diff --git a/apparmor.d/profiles-m-r/mkswap b/apparmor.d/groups/filesystem/mkswap
similarity index 100%
rename from apparmor.d/profiles-m-r/mkswap
rename to apparmor.d/groups/filesystem/mkswap
diff --git a/apparmor.d/profiles-m-r/mount b/apparmor.d/groups/filesystem/mount
similarity index 100%
rename from apparmor.d/profiles-m-r/mount
rename to apparmor.d/groups/filesystem/mount
diff --git a/apparmor.d/profiles-m-r/mount-cifs b/apparmor.d/groups/filesystem/mount-cifs
similarity index 100%
rename from apparmor.d/profiles-m-r/mount-cifs
rename to apparmor.d/groups/filesystem/mount-cifs
diff --git a/apparmor.d/profiles-m-r/mount-nfs b/apparmor.d/groups/filesystem/mount-nfs
similarity index 100%
rename from apparmor.d/profiles-m-r/mount-nfs
rename to apparmor.d/groups/filesystem/mount-nfs
diff --git a/apparmor.d/profiles-m-r/mount-zfs b/apparmor.d/groups/filesystem/mount-zfs
similarity index 100%
rename from apparmor.d/profiles-m-r/mount-zfs
rename to apparmor.d/groups/filesystem/mount-zfs
diff --git a/apparmor.d/profiles-a-f/firewall-applet b/apparmor.d/groups/firewall/firewall-applet
similarity index 100%
rename from apparmor.d/profiles-a-f/firewall-applet
rename to apparmor.d/groups/firewall/firewall-applet
diff --git a/apparmor.d/profiles-a-f/firewall-config b/apparmor.d/groups/firewall/firewall-config
similarity index 100%
rename from apparmor.d/profiles-a-f/firewall-config
rename to apparmor.d/groups/firewall/firewall-config
diff --git a/apparmor.d/profiles-a-f/firewalld b/apparmor.d/groups/firewall/firewalld
similarity index 100%
rename from apparmor.d/profiles-a-f/firewalld
rename to apparmor.d/groups/firewall/firewalld
diff --git a/apparmor.d/profiles-m-r/nft b/apparmor.d/groups/firewall/nft
similarity index 100%
rename from apparmor.d/profiles-m-r/nft
rename to apparmor.d/groups/firewall/nft
diff --git a/apparmor.d/profiles-s-z/ufw b/apparmor.d/groups/firewall/ufw
similarity index 100%
rename from apparmor.d/profiles-s-z/ufw
rename to apparmor.d/groups/firewall/ufw
diff --git a/apparmor.d/profiles-a-f/boltd b/apparmor.d/groups/freedesktop/boltd
similarity index 100%
rename from apparmor.d/profiles-a-f/boltd
rename to apparmor.d/groups/freedesktop/boltd
diff --git a/apparmor.d/profiles-s-z/wireplumber b/apparmor.d/groups/freedesktop/wireplumber
similarity index 100%
rename from apparmor.d/profiles-s-z/wireplumber
rename to apparmor.d/groups/freedesktop/wireplumber
diff --git a/apparmor.d/profiles-g-l/lsusb b/apparmor.d/groups/usb/lsusb
similarity index 92%
rename from apparmor.d/profiles-g-l/lsusb
rename to apparmor.d/groups/usb/lsusb
index 40e902a87..f824343d6 100644
--- a/apparmor.d/profiles-g-l/lsusb
+++ b/apparmor.d/groups/usb/lsusb
@@ -7,7 +7,7 @@ abi <abi/4.0>,
 
 include <tunables/global>
 
-@{exec_path} = @{bin}/lsusb
+@{exec_path} = @{bin}/lsusb @{bin}/lsusb.py
 profile lsusb @{exec_path} {
   include <abstractions/base>
   include <abstractions/consoles>
diff --git a/apparmor.d/profiles-s-z/usb-devices b/apparmor.d/groups/usb/usb-devices
similarity index 96%
rename from apparmor.d/profiles-s-z/usb-devices
rename to apparmor.d/groups/usb/usb-devices
index c67b78faf..59ff12feb 100644
--- a/apparmor.d/profiles-s-z/usb-devices
+++ b/apparmor.d/groups/usb/usb-devices
@@ -22,6 +22,7 @@ profile usb-devices @{exec_path} {
   @{bin}/{,e}grep   rix,
   @{bin}/basename   rix,
   @{bin}/cat        rix,
+  @{bin}/sed        rix,
   @{bin}/cut        rix,
   @{bin}/find       rix,
   @{bin}/readlink   rix,
diff --git a/apparmor.d/profiles-s-z/usbguard b/apparmor.d/groups/usb/usbguard
similarity index 100%
rename from apparmor.d/profiles-s-z/usbguard
rename to apparmor.d/groups/usb/usbguard
diff --git a/apparmor.d/profiles-s-z/usbguard-applet-qt b/apparmor.d/groups/usb/usbguard-applet-qt
similarity index 100%
rename from apparmor.d/profiles-s-z/usbguard-applet-qt
rename to apparmor.d/groups/usb/usbguard-applet-qt
diff --git a/apparmor.d/profiles-s-z/usbguard-daemon b/apparmor.d/groups/usb/usbguard-daemon
similarity index 100%
rename from apparmor.d/profiles-s-z/usbguard-daemon
rename to apparmor.d/groups/usb/usbguard-daemon
diff --git a/apparmor.d/profiles-s-z/usbguard-dbus b/apparmor.d/groups/usb/usbguard-dbus
similarity index 100%
rename from apparmor.d/profiles-s-z/usbguard-dbus
rename to apparmor.d/groups/usb/usbguard-dbus
diff --git a/apparmor.d/profiles-s-z/usbguard-notifier b/apparmor.d/groups/usb/usbguard-notifier
similarity index 100%
rename from apparmor.d/profiles-s-z/usbguard-notifier
rename to apparmor.d/groups/usb/usbguard-notifier
diff --git a/apparmor.d/profiles-a-f/dmesg b/apparmor.d/groups/utils/dmesg
similarity index 100%
rename from apparmor.d/profiles-a-f/dmesg
rename to apparmor.d/groups/utils/dmesg
diff --git a/apparmor.d/profiles-s-z/whereis b/apparmor.d/groups/utils/whereis
similarity index 100%
rename from apparmor.d/profiles-s-z/whereis
rename to apparmor.d/groups/utils/whereis