Reorder imports in master file