The main restructuring thrust is nearing completion, so let's get rid
of the `restructuring` namespace.