Refactoring package structure