diff --git a/tools/tcg_rim_tool_msdotnet/RimSignCert.pem b/tools/xml_dsig_tool/RimSignCert.pem
similarity index 100%
rename from tools/tcg_rim_tool_msdotnet/RimSignCert.pem
rename to tools/xml_dsig_tool/RimSignCert.pem
diff --git a/tools/tcg_rim_tool_msdotnet/privateRimKey.pem b/tools/xml_dsig_tool/privateRimKey.pem
similarity index 100%
rename from tools/tcg_rim_tool_msdotnet/privateRimKey.pem
rename to tools/xml_dsig_tool/privateRimKey.pem
diff --git a/tools/tcg_rim_tool_msdotnet/generated_user_cert.swidtag b/tools/xml_dsig_tool/unsigned.xml
similarity index 52%
rename from tools/tcg_rim_tool_msdotnet/generated_user_cert.swidtag
rename to tools/xml_dsig_tool/unsigned.xml
index a86b1edb..1fa11f85 100644
--- a/tools/tcg_rim_tool_msdotnet/generated_user_cert.swidtag
+++ b/tools/xml_dsig_tool/unsigned.xml
@@ -8,34 +8,4 @@
       <File xmlns:SHA256="http://www.w3.org/2001/04/xmlenc#sha256" SHA256:hash="4479ca722623f8c47b703996ced3cbd981b06b1ae8a897db70137e0b7c546848" name="Example.com.BIOS.01.rimel" size="7549"/>
     </Directory>
   </Payload>
-  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-    <SignedInfo>
-      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-      <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <Reference URI="">
-        <Transforms>
-          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-        </Transforms>
-        <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-        <DigestValue>97uWB7zSsO5WaGbrcQrlKd1Bju0aDTjK1/ktUYBje8A=</DigestValue>
-      </Reference>
-    </SignedInfo>
-    <SignatureValue>N1YtTeo2Ryuj+CtlXIpICEay+ni7vt8+4J7tAsYpa3efnLwtea69PIqEylPWm9LdA8Eo8XDdpgxV&#13;
-7h3hi2LTOU+Wxq3bLiLamo99T1EtIwl+ZPcOv8bsfEkmShHdMC0dlfcj6r7x4tc0XkNAhhJgfRNz&#13;
-FsmPWKJb6FYcsHFbHO/Uw1hSokbAGcWWTshEOqvKHMa8UVkrFMUPnrnMtdyJqZlhDBrZHNi4rWth&#13;
-8TjlUnQVSCF9s9I04FxJ1cUAdeVMHtXKM8Pvjv68PaJMJK73dW5Yd3SbcgoKLesf/HPWeeZL0rr4&#13;
-TNjlqJ/wq61Ons45MFG9bIscVbnd+XxFHx8Skw==</SignatureValue>
-    <KeyInfo>
-      <KeyValue>
-        <RSAKeyValue>
-          <Modulus>p3WVYaRJG7EABjbAdqDYZXFSTV1nHY9Ol9A5+W8t5xwBXBryZCGWxERGr5AryKWPxd+qzjj+cFpx&#13;
-xkM6N18jEhQIx/CEZePEJqpluBO5w2wTEOe7hqtMatqgDDMeDRxUuIpP8LGP00vh1wyDFFew90d9&#13;
-dvT3bcLvFh3a3ap9bTm6aBqPup5CXpzrwIU2wZfgkDytYVBm+8bHkMaUrgpNyM+5BAg2zl/Fqw0q&#13;
-otjaGr7PzbH+urCvaGbKLMPoWkVLIgAE8Qw98HTfoYSFHC7VYQySrzIinaOBFSgViR72kHemH2lW&#13;
-jDQeHiY0VIoPik/jVVIpjWe6zzeZ2S66Q/LmjQ==</Modulus>
-          <Exponent>AQAB</Exponent>
-        </RSAKeyValue>
-      </KeyValue>
-    </KeyInfo>
-  </Signature>
 </SoftwareIdentity>
diff --git a/tools/tcg_rim_tool_msdotnet/xmlDsig.cs b/tools/xml_dsig_tool/xmlDsig.cs
similarity index 100%
rename from tools/tcg_rim_tool_msdotnet/xmlDsig.cs
rename to tools/xml_dsig_tool/xmlDsig.cs