SCSS restructuring