Ability to organise AE brand shared templates into subject folder for users

When will the ability to organise AE shared templates into folders from the USERS end become available?. I am working on a global brand and all the assets I need to create is building up and becoming really messy and disorganised for everyone that wants to use them including myself.