refactoring of package names for consistency