Update namespacing and README