Refactored the packages