OGM-292

* Using "context" instead of "navigation" as it's used in the datastore modules
* Removing the intermediary "generic" package