Template Organization

Is there a way to create folders in Entry templates so that "like" templates can be grouped together?

For example, different management portals work better or only in certain browsers, so I have a generic template for every browser type. Each of these are duplicated for HTTPS or HTTP usage, again depending on what a given management portal or web ui requires. And so on.

As it is I'm depending on a naming convention to "organize" the templates, but this breaks down when there are much more than 2 variables. For example, all of the above is true, but for Fortinet devices, the automatic login often requires customized form information to work properly, and this varies by device type and firmware version. Ideally,

I'd like to be able to create folders and sub folders I can drop templates into so I can organize by Vendor, then version, for this example. And separately for the previous example (browsers) I'd have a folder for browsers, and then a sub folder for protocols.