Some scss restructuring.. see attached commits