Changing everything to be compatible with a package