reorder like models.py and add missing ones