Cleanup namespaces

[tscrim]

There are far too many of them and all of the code should be under one unified namespace.