Undid refactoring, spoticli is small enough to keep in a few larger files, versus a ton of little files that would have a lot of unecessary abstractions of libspotify