SCSS structure improvements