Numerous improvements including rearranging namespaces