Move mixins into models directory for now