restructured the sass folder and files to promote a more modular workflow
merge conflict