Move mixins to dedicated namespace