Sass library reoganisation for going forwards