diff --git a/apparmor.d/profiles-a-f/anacron b/apparmor.d/groups/cron/anacron
similarity index 100%
rename from apparmor.d/profiles-a-f/anacron
rename to apparmor.d/groups/cron/anacron
diff --git a/apparmor.d/profiles-g-l/htop b/apparmor.d/groups/procps/htop
similarity index 100%
rename from apparmor.d/profiles-g-l/htop
rename to apparmor.d/groups/procps/htop
diff --git a/apparmor.d/profiles-m-r/ps b/apparmor.d/groups/procps/ps
similarity index 100%
rename from apparmor.d/profiles-m-r/ps
rename to apparmor.d/groups/procps/ps
diff --git a/apparmor.d/profiles-s-z/sysctl b/apparmor.d/groups/procps/sysctl
similarity index 100%
rename from apparmor.d/profiles-s-z/sysctl
rename to apparmor.d/groups/procps/sysctl
diff --git a/apparmor.d/profiles-s-z/top b/apparmor.d/groups/procps/top
similarity index 100%
rename from apparmor.d/profiles-s-z/top
rename to apparmor.d/groups/procps/top
diff --git a/apparmor.d/profiles-s-z/uptime b/apparmor.d/groups/procps/uptime
similarity index 100%
rename from apparmor.d/profiles-s-z/uptime
rename to apparmor.d/groups/procps/uptime
diff --git a/apparmor.d/profiles-s-z/w b/apparmor.d/groups/procps/w
similarity index 100%
rename from apparmor.d/profiles-s-z/w
rename to apparmor.d/groups/procps/w
diff --git a/apparmor.d/profiles-a-f/chage b/apparmor.d/groups/shadow/chage
similarity index 100%
rename from apparmor.d/profiles-a-f/chage
rename to apparmor.d/groups/shadow/chage
diff --git a/apparmor.d/profiles-a-f/chpasswd b/apparmor.d/groups/shadow/chpasswd
similarity index 100%
rename from apparmor.d/profiles-a-f/chpasswd
rename to apparmor.d/groups/shadow/chpasswd
diff --git a/apparmor.d/profiles-g-l/gpasswd b/apparmor.d/groups/shadow/gpasswd
similarity index 100%
rename from apparmor.d/profiles-g-l/gpasswd
rename to apparmor.d/groups/shadow/gpasswd
diff --git a/apparmor.d/profiles-g-l/groupadd b/apparmor.d/groups/shadow/groupadd
similarity index 100%
rename from apparmor.d/profiles-g-l/groupadd
rename to apparmor.d/groups/shadow/groupadd
diff --git a/apparmor.d/profiles-g-l/groupdel b/apparmor.d/groups/shadow/groupdel
similarity index 100%
rename from apparmor.d/profiles-g-l/groupdel
rename to apparmor.d/groups/shadow/groupdel
diff --git a/apparmor.d/profiles-g-l/groupmod b/apparmor.d/groups/shadow/groupmod
similarity index 100%
rename from apparmor.d/profiles-g-l/groupmod
rename to apparmor.d/groups/shadow/groupmod
diff --git a/apparmor.d/profiles-g-l/grpck b/apparmor.d/groups/shadow/grpck
similarity index 100%
rename from apparmor.d/profiles-g-l/grpck
rename to apparmor.d/groups/shadow/grpck
diff --git a/apparmor.d/profiles-g-l/lastlog b/apparmor.d/groups/shadow/lastlog
similarity index 100%
rename from apparmor.d/profiles-g-l/lastlog
rename to apparmor.d/groups/shadow/lastlog
diff --git a/apparmor.d/profiles-m-r/newgidmap b/apparmor.d/groups/shadow/newgidmap
similarity index 100%
rename from apparmor.d/profiles-m-r/newgidmap
rename to apparmor.d/groups/shadow/newgidmap
diff --git a/apparmor.d/profiles-m-r/newuidmap b/apparmor.d/groups/shadow/newuidmap
similarity index 100%
rename from apparmor.d/profiles-m-r/newuidmap
rename to apparmor.d/groups/shadow/newuidmap
diff --git a/apparmor.d/profiles-m-r/passwd b/apparmor.d/groups/shadow/passwd
similarity index 100%
rename from apparmor.d/profiles-m-r/passwd
rename to apparmor.d/groups/shadow/passwd
diff --git a/apparmor.d/profiles-m-r/pwck b/apparmor.d/groups/shadow/pwck
similarity index 100%
rename from apparmor.d/profiles-m-r/pwck
rename to apparmor.d/groups/shadow/pwck
diff --git a/apparmor.d/profiles-s-z/useradd b/apparmor.d/groups/shadow/useradd
similarity index 100%
rename from apparmor.d/profiles-s-z/useradd
rename to apparmor.d/groups/shadow/useradd
diff --git a/apparmor.d/profiles-s-z/userdel b/apparmor.d/groups/shadow/userdel
similarity index 100%
rename from apparmor.d/profiles-s-z/userdel
rename to apparmor.d/groups/shadow/userdel
diff --git a/apparmor.d/profiles-s-z/usermod b/apparmor.d/groups/shadow/usermod
similarity index 100%
rename from apparmor.d/profiles-s-z/usermod
rename to apparmor.d/groups/shadow/usermod
diff --git a/apparmor.d/profiles-a-f/agetty b/apparmor.d/groups/utils/agetty
similarity index 100%
rename from apparmor.d/profiles-a-f/agetty
rename to apparmor.d/groups/utils/agetty
diff --git a/apparmor.d/profiles-a-f/blkid b/apparmor.d/groups/utils/blkid
similarity index 100%
rename from apparmor.d/profiles-a-f/blkid
rename to apparmor.d/groups/utils/blkid
diff --git a/apparmor.d/profiles-a-f/blockdev b/apparmor.d/groups/utils/blockdev
similarity index 100%
rename from apparmor.d/profiles-a-f/blockdev
rename to apparmor.d/groups/utils/blockdev
diff --git a/apparmor.d/profiles-a-f/chfn b/apparmor.d/groups/utils/chfn
similarity index 100%
rename from apparmor.d/profiles-a-f/chfn
rename to apparmor.d/groups/utils/chfn
diff --git a/apparmor.d/profiles-a-f/chsh b/apparmor.d/groups/utils/chsh
similarity index 100%
rename from apparmor.d/profiles-a-f/chsh
rename to apparmor.d/groups/utils/chsh
diff --git a/apparmor.d/profiles-a-f/df b/apparmor.d/groups/utils/df
similarity index 100%
rename from apparmor.d/profiles-a-f/df
rename to apparmor.d/groups/utils/df
diff --git a/apparmor.d/profiles-a-f/eject b/apparmor.d/groups/utils/eject
similarity index 100%
rename from apparmor.d/profiles-a-f/eject
rename to apparmor.d/groups/utils/eject
diff --git a/apparmor.d/profiles-a-f/findmnt b/apparmor.d/groups/utils/findmnt
similarity index 100%
rename from apparmor.d/profiles-a-f/findmnt
rename to apparmor.d/groups/utils/findmnt
diff --git a/apparmor.d/profiles-a-f/fsck b/apparmor.d/groups/utils/fsck
similarity index 100%
rename from apparmor.d/profiles-a-f/fsck
rename to apparmor.d/groups/utils/fsck
diff --git a/apparmor.d/profiles-a-f/fstrim b/apparmor.d/groups/utils/fstrim
similarity index 100%
rename from apparmor.d/profiles-a-f/fstrim
rename to apparmor.d/groups/utils/fstrim
diff --git a/apparmor.d/profiles-g-l/locale-gen b/apparmor.d/groups/utils/locale-gen
similarity index 100%
rename from apparmor.d/profiles-g-l/locale-gen
rename to apparmor.d/groups/utils/locale-gen
diff --git a/apparmor.d/profiles-g-l/login b/apparmor.d/groups/utils/login
similarity index 100%
rename from apparmor.d/profiles-g-l/login
rename to apparmor.d/groups/utils/login
diff --git a/apparmor.d/profiles-g-l/losetup b/apparmor.d/groups/utils/losetup
similarity index 100%
rename from apparmor.d/profiles-g-l/losetup
rename to apparmor.d/groups/utils/losetup
diff --git a/apparmor.d/profiles-g-l/lsblk b/apparmor.d/groups/utils/lsblk
similarity index 100%
rename from apparmor.d/profiles-g-l/lsblk
rename to apparmor.d/groups/utils/lsblk
diff --git a/apparmor.d/profiles-g-l/lscpu b/apparmor.d/groups/utils/lscpu
similarity index 100%
rename from apparmor.d/profiles-g-l/lscpu
rename to apparmor.d/groups/utils/lscpu
diff --git a/apparmor.d/profiles-g-l/lspci b/apparmor.d/groups/utils/lspci
similarity index 100%
rename from apparmor.d/profiles-g-l/lspci
rename to apparmor.d/groups/utils/lspci
diff --git a/apparmor.d/profiles-m-r/newgrp b/apparmor.d/groups/utils/newgrp
similarity index 100%
rename from apparmor.d/profiles-m-r/newgrp
rename to apparmor.d/groups/utils/newgrp
diff --git a/apparmor.d/profiles-m-r/nologin b/apparmor.d/groups/utils/nologin
similarity index 100%
rename from apparmor.d/profiles-m-r/nologin
rename to apparmor.d/groups/utils/nologin
diff --git a/apparmor.d/profiles-m-r/pstree b/apparmor.d/groups/utils/pstree
similarity index 100%
rename from apparmor.d/profiles-m-r/pstree
rename to apparmor.d/groups/utils/pstree
diff --git a/apparmor.d/profiles-s-z/su b/apparmor.d/groups/utils/su
similarity index 100%
rename from apparmor.d/profiles-s-z/su
rename to apparmor.d/groups/utils/su
diff --git a/apparmor.d/profiles-s-z/sulogin b/apparmor.d/groups/utils/sulogin
similarity index 100%
rename from apparmor.d/profiles-s-z/sulogin
rename to apparmor.d/groups/utils/sulogin
diff --git a/apparmor.d/profiles-s-z/swapon b/apparmor.d/groups/utils/swapon
similarity index 100%
rename from apparmor.d/profiles-s-z/swapon
rename to apparmor.d/groups/utils/swapon
diff --git a/apparmor.d/profiles-s-z/sync b/apparmor.d/groups/utils/sync
similarity index 100%
rename from apparmor.d/profiles-s-z/sync
rename to apparmor.d/groups/utils/sync
diff --git a/apparmor.d/profiles-s-z/uname b/apparmor.d/groups/utils/uname
similarity index 100%
rename from apparmor.d/profiles-s-z/uname
rename to apparmor.d/groups/utils/uname
diff --git a/apparmor.d/profiles-s-z/users b/apparmor.d/groups/utils/users
similarity index 100%
rename from apparmor.d/profiles-s-z/users
rename to apparmor.d/groups/utils/users
diff --git a/apparmor.d/profiles-s-z/uuidd b/apparmor.d/groups/utils/uuidd
similarity index 100%
rename from apparmor.d/profiles-s-z/uuidd
rename to apparmor.d/groups/utils/uuidd
diff --git a/apparmor.d/profiles-s-z/uuidgen b/apparmor.d/groups/utils/uuidgen
similarity index 100%
rename from apparmor.d/profiles-s-z/uuidgen
rename to apparmor.d/groups/utils/uuidgen
diff --git a/apparmor.d/profiles-s-z/who b/apparmor.d/groups/utils/who
similarity index 100%
rename from apparmor.d/profiles-s-z/who
rename to apparmor.d/groups/utils/who
diff --git a/apparmor.d/groups/systemd/zramctl b/apparmor.d/groups/utils/zramctl
similarity index 100%
rename from apparmor.d/groups/systemd/zramctl
rename to apparmor.d/groups/utils/zramctl