Reorganized the config files