Updated sass structure / files