Organize Custom Forms into Folders

With multiple departments (groups) in our instance, the custom forms are getting crazy. It would be a LIFESAVER to be able to sort custom forms into folders to cut down on the chaos.