update pack + start models.py refactoring