Refactoring code: adding new packages