Refactoring of package names to remove one level of package hierarchy