Cleanup docs and tweak namespaces