Clean namespaces and use statements in the API