diff --git a/apparmor.d/profiles-a-f/filecap b/apparmor.d/groups/cap/filecap
similarity index 100%
rename from apparmor.d/profiles-a-f/filecap
rename to apparmor.d/groups/cap/filecap
diff --git a/apparmor.d/profiles-m-r/netcap b/apparmor.d/groups/cap/netcap
similarity index 100%
rename from apparmor.d/profiles-m-r/netcap
rename to apparmor.d/groups/cap/netcap
diff --git a/apparmor.d/profiles-m-r/pscap b/apparmor.d/groups/cap/pscap
similarity index 100%
rename from apparmor.d/profiles-m-r/pscap
rename to apparmor.d/groups/cap/pscap
diff --git a/apparmor.d/profiles-a-f/btrfs b/apparmor.d/groups/filesystem/btrfs
similarity index 100%
rename from apparmor.d/profiles-a-f/btrfs
rename to apparmor.d/groups/filesystem/btrfs
diff --git a/apparmor.d/profiles-a-f/btrfs-convert b/apparmor.d/groups/filesystem/btrfs-convert
similarity index 100%
rename from apparmor.d/profiles-a-f/btrfs-convert
rename to apparmor.d/groups/filesystem/btrfs-convert
diff --git a/apparmor.d/profiles-a-f/btrfs-find-root b/apparmor.d/groups/filesystem/btrfs-find-root
similarity index 100%
rename from apparmor.d/profiles-a-f/btrfs-find-root
rename to apparmor.d/groups/filesystem/btrfs-find-root
diff --git a/apparmor.d/profiles-a-f/btrfs-image b/apparmor.d/groups/filesystem/btrfs-image
similarity index 100%
rename from apparmor.d/profiles-a-f/btrfs-image
rename to apparmor.d/groups/filesystem/btrfs-image
diff --git a/apparmor.d/profiles-a-f/btrfs-map-logical b/apparmor.d/groups/filesystem/btrfs-map-logical
similarity index 100%
rename from apparmor.d/profiles-a-f/btrfs-map-logical
rename to apparmor.d/groups/filesystem/btrfs-map-logical
diff --git a/apparmor.d/profiles-a-f/btrfs-select-super b/apparmor.d/groups/filesystem/btrfs-select-super
similarity index 100%
rename from apparmor.d/profiles-a-f/btrfs-select-super
rename to apparmor.d/groups/filesystem/btrfs-select-super
diff --git a/apparmor.d/profiles-a-f/btrfstune b/apparmor.d/groups/filesystem/btrfstune
similarity index 100%
rename from apparmor.d/profiles-a-f/btrfstune
rename to apparmor.d/groups/filesystem/btrfstune
diff --git a/apparmor.d/profiles-a-f/fsck.btrfs b/apparmor.d/groups/filesystem/fsck.btrfs
similarity index 100%
rename from apparmor.d/profiles-a-f/fsck.btrfs
rename to apparmor.d/groups/filesystem/fsck.btrfs
diff --git a/apparmor.d/profiles-a-f/fsck.fat b/apparmor.d/groups/filesystem/fsck.fat
similarity index 100%
rename from apparmor.d/profiles-a-f/fsck.fat
rename to apparmor.d/groups/filesystem/fsck.fat
diff --git a/apparmor.d/profiles-g-l/lvm b/apparmor.d/groups/filesystem/lvm
similarity index 100%
rename from apparmor.d/profiles-g-l/lvm
rename to apparmor.d/groups/filesystem/lvm
diff --git a/apparmor.d/profiles-g-l/lvmconfig b/apparmor.d/groups/filesystem/lvmconfig
similarity index 100%
rename from apparmor.d/profiles-g-l/lvmconfig
rename to apparmor.d/groups/filesystem/lvmconfig
diff --git a/apparmor.d/profiles-g-l/lvmdump b/apparmor.d/groups/filesystem/lvmdump
similarity index 100%
rename from apparmor.d/profiles-g-l/lvmdump
rename to apparmor.d/groups/filesystem/lvmdump
diff --git a/apparmor.d/profiles-g-l/lvmpolld b/apparmor.d/groups/filesystem/lvmpolld
similarity index 100%
rename from apparmor.d/profiles-g-l/lvmpolld
rename to apparmor.d/groups/filesystem/lvmpolld
diff --git a/apparmor.d/profiles-m-r/mtools b/apparmor.d/groups/filesystem/mtools
similarity index 100%
rename from apparmor.d/profiles-m-r/mtools
rename to apparmor.d/groups/filesystem/mtools
diff --git a/apparmor.d/profiles-m-r/nfsdcld b/apparmor.d/groups/filesystem/nfsdcld
similarity index 100%
rename from apparmor.d/profiles-m-r/nfsdcld
rename to apparmor.d/groups/filesystem/nfsdcld
diff --git a/apparmor.d/profiles-m-r/ntfs-3g b/apparmor.d/groups/filesystem/ntfs-3g
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfs-3g
rename to apparmor.d/groups/filesystem/ntfs-3g
diff --git a/apparmor.d/profiles-m-r/ntfs-3g-probe b/apparmor.d/groups/filesystem/ntfs-3g-probe
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfs-3g-probe
rename to apparmor.d/groups/filesystem/ntfs-3g-probe
diff --git a/apparmor.d/profiles-m-r/ntfscat b/apparmor.d/groups/filesystem/ntfscat
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfscat
rename to apparmor.d/groups/filesystem/ntfscat
diff --git a/apparmor.d/profiles-m-r/ntfsclone b/apparmor.d/groups/filesystem/ntfsclone
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsclone
rename to apparmor.d/groups/filesystem/ntfsclone
diff --git a/apparmor.d/profiles-m-r/ntfscluster b/apparmor.d/groups/filesystem/ntfscluster
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfscluster
rename to apparmor.d/groups/filesystem/ntfscluster
diff --git a/apparmor.d/profiles-m-r/ntfscmp b/apparmor.d/groups/filesystem/ntfscmp
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfscmp
rename to apparmor.d/groups/filesystem/ntfscmp
diff --git a/apparmor.d/profiles-m-r/ntfscp b/apparmor.d/groups/filesystem/ntfscp
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfscp
rename to apparmor.d/groups/filesystem/ntfscp
diff --git a/apparmor.d/profiles-m-r/ntfsdecrypt b/apparmor.d/groups/filesystem/ntfsdecrypt
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsdecrypt
rename to apparmor.d/groups/filesystem/ntfsdecrypt
diff --git a/apparmor.d/profiles-m-r/ntfsfallocate b/apparmor.d/groups/filesystem/ntfsfallocate
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsfallocate
rename to apparmor.d/groups/filesystem/ntfsfallocate
diff --git a/apparmor.d/profiles-m-r/ntfsfix b/apparmor.d/groups/filesystem/ntfsfix
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsfix
rename to apparmor.d/groups/filesystem/ntfsfix
diff --git a/apparmor.d/profiles-m-r/ntfsinfo b/apparmor.d/groups/filesystem/ntfsinfo
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsinfo
rename to apparmor.d/groups/filesystem/ntfsinfo
diff --git a/apparmor.d/profiles-m-r/ntfslabel b/apparmor.d/groups/filesystem/ntfslabel
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfslabel
rename to apparmor.d/groups/filesystem/ntfslabel
diff --git a/apparmor.d/profiles-m-r/ntfsls b/apparmor.d/groups/filesystem/ntfsls
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsls
rename to apparmor.d/groups/filesystem/ntfsls
diff --git a/apparmor.d/profiles-m-r/ntfsmove b/apparmor.d/groups/filesystem/ntfsmove
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsmove
rename to apparmor.d/groups/filesystem/ntfsmove
diff --git a/apparmor.d/profiles-m-r/ntfsrecover b/apparmor.d/groups/filesystem/ntfsrecover
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsrecover
rename to apparmor.d/groups/filesystem/ntfsrecover
diff --git a/apparmor.d/profiles-m-r/ntfsresize b/apparmor.d/groups/filesystem/ntfsresize
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsresize
rename to apparmor.d/groups/filesystem/ntfsresize
diff --git a/apparmor.d/profiles-m-r/ntfssecaudit b/apparmor.d/groups/filesystem/ntfssecaudit
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfssecaudit
rename to apparmor.d/groups/filesystem/ntfssecaudit
diff --git a/apparmor.d/profiles-m-r/ntfstruncate b/apparmor.d/groups/filesystem/ntfstruncate
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfstruncate
rename to apparmor.d/groups/filesystem/ntfstruncate
diff --git a/apparmor.d/profiles-m-r/ntfsundelete b/apparmor.d/groups/filesystem/ntfsundelete
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsundelete
rename to apparmor.d/groups/filesystem/ntfsundelete
diff --git a/apparmor.d/profiles-m-r/ntfsusermap b/apparmor.d/groups/filesystem/ntfsusermap
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfsusermap
rename to apparmor.d/groups/filesystem/ntfsusermap
diff --git a/apparmor.d/profiles-m-r/ntfswipe b/apparmor.d/groups/filesystem/ntfswipe
similarity index 100%
rename from apparmor.d/profiles-m-r/ntfswipe
rename to apparmor.d/groups/filesystem/ntfswipe
diff --git a/apparmor.d/profiles-s-z/udiskie b/apparmor.d/groups/filesystem/udiskie
similarity index 100%
rename from apparmor.d/profiles-s-z/udiskie
rename to apparmor.d/groups/filesystem/udiskie
diff --git a/apparmor.d/profiles-s-z/udiskie-info b/apparmor.d/groups/filesystem/udiskie-info
similarity index 100%
rename from apparmor.d/profiles-s-z/udiskie-info
rename to apparmor.d/groups/filesystem/udiskie-info
diff --git a/apparmor.d/profiles-s-z/udiskie-mount b/apparmor.d/groups/filesystem/udiskie-mount
similarity index 100%
rename from apparmor.d/profiles-s-z/udiskie-mount
rename to apparmor.d/groups/filesystem/udiskie-mount
diff --git a/apparmor.d/profiles-s-z/udiskie-umount b/apparmor.d/groups/filesystem/udiskie-umount
similarity index 100%
rename from apparmor.d/profiles-s-z/udiskie-umount
rename to apparmor.d/groups/filesystem/udiskie-umount
diff --git a/apparmor.d/profiles-s-z/udisksctl b/apparmor.d/groups/filesystem/udisksctl
similarity index 100%
rename from apparmor.d/profiles-s-z/udisksctl
rename to apparmor.d/groups/filesystem/udisksctl
diff --git a/apparmor.d/profiles-s-z/udisksd b/apparmor.d/groups/filesystem/udisksd
similarity index 100%
rename from apparmor.d/profiles-s-z/udisksd
rename to apparmor.d/groups/filesystem/udisksd
diff --git a/apparmor.d/profiles-s-z/umount.udisks2 b/apparmor.d/groups/filesystem/umount.udisks2
similarity index 100%
rename from apparmor.d/profiles-s-z/umount.udisks2
rename to apparmor.d/groups/filesystem/umount.udisks2
diff --git a/apparmor.d/profiles-s-z/swaplabel b/apparmor.d/groups/utils/swaplabel
similarity index 100%
rename from apparmor.d/profiles-s-z/swaplabel
rename to apparmor.d/groups/utils/swaplabel
diff --git a/apparmor.d/profiles-s-z/umount b/apparmor.d/groups/utils/umount
similarity index 100%
rename from apparmor.d/profiles-s-z/umount
rename to apparmor.d/groups/utils/umount