Reorder imports in main