Clean up! Removed unused classes. Renamed alternative classes.