Restructuring SCSS