merged old config with new config, made consistent config files and config variables in app