Adjust namespacing and docs