Fix all the package import and renaming