Corrections to Namespaces

Made some corrections to the namespaces so they are accessible in a
sensible manner when making use of the library.