Moving a few classes around namespaces