re-arrange package structure