CMS-2711 Move Mixins to File