refactor the package declaration