Add ordered system object query
Rename some of the query models.

The experiment continues, though I am not sure it is really worth it
yet.  I really like the projection extensions so far, though.
Move some things around.