Adding spec model to project.
Renaming packages so they reflect names used on the spec model.