Refactored the package name