Restructured the models.