Moved mixin to its own directory