Adding the loader.

Some re-org.
Some re-design of minor nav apis.