Fix all changes with new config.json for all the contents to be in one
file.