Refactoring package structure.