Package Refactoring
Better verbose