Class name cleanup, Sass organization cleanup