Adjust the package structure