Custom folders for gifs?

Something that'd be really cool is if we could under 'Favorites' in the gifs menu was make custom folders where we can put specific gifs into. I find myself favoriting a ton of gifs which mean that if there's a specific gif I'd like to send but I favorited a couple weeks ago I have a very hard time finding it. So if I'd like to have a varied selection of dance gifs to choose from or intern joke gifs I could just go into the folder and pick one instead of scrolling for potentially many minutes to only end up not finding it.