Moving back to single config file