Update scss strucutre
Merge branch 'master' of https://github.com/ducdigital/s42m