Refactored the package names and class names