Reworked whole package structure