Went back to just one configuration file