Non-TV/Movie Media, Opinions Needed

I have been using Kodi for a few months now and I absolutely love it. I’m just not sure how to best manage my media that does not fall under the TV/Movie umbrella. I currently have all my media spread out on my NAS (6 different HD Volumes) and organized into folders (TV, Movie, Sports Games, Compilations, Pro Wrestling Events, Pro Wrestling matches, etc., etc.).

This is where I was hoping everybody could offer me advice on the best way to handle the media that does not fall under the TV/Movie categories. I would love to access them the same way as TV/Movie Library so I can use all of the features and add-ons (PseudoTV Live, etc.), just not sure how practical it is. How would everyone else handle this situation? Is there a good way to handle this or should I just watch the non TV/Movie stuff through the file listing and forget about it? Either way I am sure that I will be doing a lot of file re-naming but just curious what my options are.

Thanks in advance for the help.