Move models

Renames models and rich variant context; also, rebased on master to pick up an update; I believe that's why this is showing as unmergable.