Restructure & Consolidate Sass and CSS structure 

This change resolves some errors/warnings that we received from the Theme Checker.