Refactor sass-directory structure