Refactor package structure.