restructuring some sass files, reducing specificity