reorganized mixins structure