Restructured SCSS