Clean up SCSS file organization