Move mixins into models directory for now
Move format check into format block