Move mixins/ to root-level and clean up handlers.