Use filter-branch to correct the trunk/packages/$package/$package setup from earlier in the repo history.