Reconfigured the package structure