Update organization, remove old package