Improvements to Sass file structure