Organizing Favorites Into Folders

I’m not exactly sure where to post this. I’ve been using Kodi for a couple of years now but I’ve never used the forums because I never needed them (except for setup). Is there a way, via add-on or feature, that I can organize my Favorites into folders? ie TV shows, Movies, etc? As of right now, everything is just thrown into one folder for favorites.