Refactor Sass files with nesting