Adjusted namespaces within classes used in library