Refactoring of package names