Trying to complete the renaming of the package