Reorganize config files