Revised package pointers based on changes to model.
Relocated file and revised packages that it points to.
Moved and renamed files.