Sass restructure