Refactoring scss file structure.
Merge branch 'develop'