Refactored code - changed package