Moving some more types to where they belong