Sass file structure + some minor changes