Fix music
Move instances around

Since we control the location of instances, they can have subfolders to
organise things a bit more.