Refactoring and organizing as packages