reorganization mixins and extends

reorganization mixins and extends