Update models.py

refactored model structure to have everything based on modifiers