Reworking SCSS organization