Refactor models and their specs.