restructured SCSS and CSS structure to improve consistency of paths
Merge remote-tracking branch 'origin/master'