Reorganize mixins and G R U N T