Restructure models.py