Refactored name of packages