Firewall rules: Rule groups/containers for management

We're up to nearly 150 firewall rules with one of our large clients. We would love it if we could drop a number of rules into a single container/group within the interface to keep together and give the group a name and description. Firewall rules inside containers should stay in the proper order within the group and moving the container would move all the rules together in a single go. Descriptions of the group could be filled out to explain the purpose of the group (Ex: Allow subset of users access to XYZ). 

Maybe have a (+) button to the left of the group to expand/collapse viewing the individual rules in each group? Granted, this might be harder to do in a page that only allows XX rules on the page….