Updated model classes, boilerplate and repackaged.