Renaming

Renamed all classes to be singular instead of plural, also made the
music no-pointer