more refactoring for new package name