Updated sass import structure, to better facilitate choice imports