Cleaned up files and added Music and Sound controller