Restructured entire SASS structure
upstream changes from _s