Reorganize configs