Refactored Sass structure