I set up my keyboards in the same manner, everything polished and filed by song name. If I get a request, will pull up a similar song. I think there is merit, also, in having some generic styles, but haven't done it.
_________________________
pa4X 76 ,SX900, Hammond SK1, Ketron SD40,Ketron Event X Centerpoint Space Station, Bose compact