Cleaning up namespaces and modules for api documentaiton