Neatening model classes, update Scala version