Namespacing + doc patches.
Start working on instrumentation module to ease testing.