Some changes to the sass structure