Forms Feature Request

I'm wondering, if there isn't already a way, if there are plans to add the ability to create folders or an archive feature for Forms, particularly those hosted in a Teams environment. For Teams that have a lot of forms created that have to be saved for retention policies, it can quickly feel cluttered with no way to sort or hide non-current forms since the Collections feature only works with forms not owned in a Teams environment.