SCSS related updates and organization