.refactor the package structure