Re-arrange imports