Update Package Structure