"too many files in folder" warning - better ways to manage samples/loops?

idealflaw

i've got a mega-folder full of drum loops (I prefer natural drums vs programming). Often i get a warning / error message ""too many files in folder" which,,, makes sense because there are indeed too many files in there for my tastes too.

is there a better way to manage this that improves performance? subfolders? i haven't gone subfolder route yet because getting to various folders is still clunky shift+kits combo, ..