Refactored package name and class name