Refactored packages to assignment2