updated sass structure and mixins