reorganizes models validations and relationships