Make Folders in song library

It would be great to have seperate folders in the song library that we can customise and add songs say by theme etc.
also turn off the feature that viewing the song in ‘song select’ tab automatically adds it to your library