Refactor: hange package structure.