Reorganized config files.