More structure changes to SCSS