cleaning up namespaces and fixing coreclr issue with runtimeFlavor variable