Re-order some imports