adjust the package structure