Rearranged Mixin module structure