Clean up and condense music includes
Move music/ into audio/