Rearrange imports in compat/collections