Move classes over to new spacing utility