Moved your most recent files into the model package

should be an easy merge.