Optimize module package structure