Better Music and a little more main consolidation

The title is pretty much it