Renamed the package and refactored code