Reorganized and added to model

Small reordering of BaseRepository and added to the model for first
incremental release.