MINOR: Fixing namespacing and autoloadingh