Reorganized config files