diff --git a/Windows/RevokeChinaCerts_CodeSigning.bat b/Windows/RevokeChinaCerts_CodeSigning.bat
index 720236c3bfeee7e2596c18847eb03f355116293c..f9ba65e94e518de8a0043747904e793b2f304bb7 100644
--- a/Windows/RevokeChinaCerts_CodeSigning.bat
+++ b/Windows/RevokeChinaCerts_CodeSigning.bat
@@ -13,7 +13,7 @@ set CertMgr="%cd%\Tools\CertMgr"
 if %PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432% EQU x86 set CertMgr="%cd%\Tools\CertMgr_x86"
 set Folder=%cd%\Certs\CodeSigning
 set /a SetForce = 0
-set SetForceAppender="%cd%\Tools\SoftCertPolicyAppender\SoftCertPolicyAppender"
+set SetForceAppender="%cd%\Tools\SoftCertPolicyAppender\Binary\SoftCertPolicyAppender"
 @echo RevokeChinaCerts CodeSigning batch
 @echo.
 @echo Do you want to set force cetificates policy? [Y/N]
diff --git a/Windows/RevokeChinaCerts_Organization.bat b/Windows/RevokeChinaCerts_Organization.bat
index 71ce6f99c30a6e4592e7be66f510091f1bf6d95e..c629cbe58fdb31c45fc66dbb33af19b52fb8f69e 100644
--- a/Windows/RevokeChinaCerts_Organization.bat
+++ b/Windows/RevokeChinaCerts_Organization.bat
@@ -13,7 +13,7 @@ set CertMgr="%cd%\Tools\CertMgr"
 if %PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432% EQU x86 set CertMgr="%cd%\Tools\CertMgr_x86"
 set Folder=%cd%\Certs\Organization
 set /a SetForce = 0
-set SetForceAppender="%cd%\Tools\SoftCertPolicyAppender\SoftCertPolicyAppender"
+set SetForceAppender="%cd%\Tools\SoftCertPolicyAppender\Binary\SoftCertPolicyAppender"
 @echo RevokeChinaCerts Organization batch
 @echo.
 @echo Do you want to set force cetificates policy? [Y/N]
diff --git a/Windows/Tools/SoftCertPolicyAppender/LocalPolicy.dll b/Windows/Tools/SoftCertPolicyAppender/Binary/LocalPolicy.dll
similarity index 100%
rename from Windows/Tools/SoftCertPolicyAppender/LocalPolicy.dll
rename to Windows/Tools/SoftCertPolicyAppender/Binary/LocalPolicy.dll
diff --git a/Windows/Tools/SoftCertPolicyAppender/SoftCertPolicyAppender.exe b/Windows/Tools/SoftCertPolicyAppender/Binary/SoftCertPolicyAppender.exe
similarity index 77%
rename from Windows/Tools/SoftCertPolicyAppender/SoftCertPolicyAppender.exe
rename to Windows/Tools/SoftCertPolicyAppender/Binary/SoftCertPolicyAppender.exe
index 6d128dbaf42b7c6ea109687874feefe4cabe8ff6..88e67b297076d60cf62660acc104877793306282 100644
Binary files a/Windows/Tools/SoftCertPolicyAppender/SoftCertPolicyAppender.exe and b/Windows/Tools/SoftCertPolicyAppender/Binary/SoftCertPolicyAppender.exe differ
diff --git a/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
index a9433463d0727cf9898daa01e983883c865b8bc1..60c4ea4688db95ba1fc2a32ca34d016ee80859c7 100644
--- a/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
@@ -81,12 +81,16 @@ CertFiles:
                         }
                         catch (FileLoadException ex)
                         {
-                            Console.Write(ex.Message+" Please select retry ,ignore or abort?[R|i|a]:");
+                            Console.Write(ex.Message+" Please select Retry, Ignore or Abort(R|I|A):");
                             var select=  (Console.ReadLine()??"").ToLower();
                             switch (select)
                             {
+                                case "I":
+                                    break;
                                 case "i":
                                     break;
+                                case "A":
+                                    return;
                                 case "a":
                                     return;
                                 default: