[master] +: reorder the sass files so that a division in the same category is made