I used to DJ back in the days of CD's and then iTunes libraries, back when people owned their music. I've recently gotten back into it, but am having a hard time figuring out where to best source my music now that all of my personal music is through Spotify. (important to note - I am just DJing at home, maybe a friend's party here and there, so I don't need a commercial license). I know there used to be programs that ran through Spotify, but it appears those are all gone.

I'm currently using VirtualDJ and their partner iDJpool service, but their organization is less than ideal and the selections are spotty. I also know you can use soundcloud, but again, I've encountered similar issues. Any ideas here? Am looking for a good catalogue of electronic mainly, hopefully with some hip hop as well.