Improve package structure.