Move mixins into separate file
Move mixins into separate file