Reorder some imports