modules: refactor mixins