more self contained SCSS, project structure cleanup