Package re-structure.