rework package structure