I’ve been going through the same issue for the past year. This is what I have been doing and it seems to be working so far: First, start making basic folders for yourself in your laptop or on your hard drive (whatever you prefer). When I make my basic folders, I’ve been naming them in ways I know I would look things up or how I would use them. For example, “party hard, club music, dance starters, dinner music, calm, bar rock” etc. Now the hard part, once a day for maybe 10, 20 minutes I find folders in my hard drive already that are similar and find songs that I know or believe I would use over and over again. Then I transfer those songs into the new more organized folders. Yes, it is tedious but it seems to be paying off. I now have very organized new folders that I keep going back to consistently when at gigs. It is a big task but remember, Rome wasn’t built in a day. Best of luck to you. Hope this helped.