Making progress refactoring models.py

* Regenerated migrations again.