Code refactored to controllers and beginnings of music player