Change some file, names and remove some config files that are no longer needed