first stage of cleaning up SASS/CSS structure