Refactored the code with correct package name