Renamed classes, added relationships, updated the views