diff --git a/CASA-auth-token/client/package/windows/authtokenclientdevel_msi/authtokenclientdevel_msi.vdproj b/CASA-auth-token/client/package/windows/authtokenclientdevel_msi/authtokenclientdevel_msi.vdproj
index 99e60c04..dbdb6a10 100644
--- a/CASA-auth-token/client/package/windows/authtokenclientdevel_msi/authtokenclientdevel_msi.vdproj
+++ b/CASA-auth-token/client/package/windows/authtokenclientdevel_msi/authtokenclientdevel_msi.vdproj
@@ -13,42 +13,12 @@
 "SccProvider" = "8:"
     "Hierarchy"
     {
-        "Entry"
-        {
-        "MsmKey" = "8:_6C3DD45AD8C1483F86D675A90FED869A"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_6EDE68CCF3A94C38966EFE5AF522E76E"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E81BA356D9F8490196AD0D8DFCEE3C65"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_F0E27FD8FB8442078E86B253A1D4FF5C"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
         "Entry"
         {
         "MsmKey" = "8:_FD0A8D57CFD64B5CADAF19B3B9BCB7B8"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6C3DD45AD8C1483F86D675A90FED869A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
     }
     "Configurations"
     {
@@ -154,66 +124,6 @@
         }
         "File"
         {
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6EDE68CCF3A94C38966EFE5AF522E76E"
-            {
-            "SourcePath" = "8:..\\..\\..\\lib\\windows\\casa_authtoken.lib"
-            "TargetName" = "8:casa_authtoken.lib"
-            "Tag" = "8:"
-            "Folder" = "8:_E7DF0B5C6F4F44C1AA19AFB03393A43F"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E81BA356D9F8490196AD0D8DFCEE3C65"
-            {
-            "SourcePath" = "8:..\\..\\..\\include\\casa_c_authtoken.h"
-            "TargetName" = "8:casa_c_authtoken.h"
-            "Tag" = "8:"
-            "Folder" = "8:_1EBAF38843F146888065150901409A34"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F0E27FD8FB8442078E86B253A1D4FF5C"
-            {
-            "SourcePath" = "8:..\\..\\..\\include\\windows\\casa_c_authtoken_ex.h"
-            "TargetName" = "8:casa_c_authtoken_ex.h"
-            "Tag" = "8:"
-            "Folder" = "8:_1EBAF38843F146888065150901409A34"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
         }
         "FileType"
         {
@@ -843,34 +753,6 @@
         }
         "ProjectOutput"
         {
-            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6C3DD45AD8C1483F86D675A90FED869A"
-            {
-            "SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_031A08D93F304AE690C6F4EF4BBC46D6"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{1BA1FC97-5AF1-4506-A7FD-EBFD46D361A0}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FD0A8D57CFD64B5CADAF19B3B9BCB7B8"
             {
             "SourcePath" = "8:..\\authtokenclientdevel_msm\\Debug\\authtokenclientdevel-msm.msm"
@@ -925,8 +807,5 @@
                 }
             }
         }
-        "VJSharpPlugin"
-        {
-        }
     }
 }
diff --git a/CASA-auth-token/client/package/windows/authtokenclientdevel_msm/authtokenclientdevel_msm.vdproj b/CASA-auth-token/client/package/windows/authtokenclientdevel_msm/authtokenclientdevel_msm.vdproj
index 0fff0bdb..ec6efbe5 100644
--- a/CASA-auth-token/client/package/windows/authtokenclientdevel_msm/authtokenclientdevel_msm.vdproj
+++ b/CASA-auth-token/client/package/windows/authtokenclientdevel_msm/authtokenclientdevel_msm.vdproj
@@ -13,6 +13,12 @@
 "SccProvider" = "8:"
     "Hierarchy"
     {
+        "Entry"
+        {
+        "MsmKey" = "8:_88C9C0D87C7449108D65C94EB7B367FE"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
         "Entry"
         {
         "MsmKey" = "8:_9831CF55115C44DDB72FE3A0E69E3CC9"
@@ -25,6 +31,18 @@
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_C51BB367E3764A609C6892AA7214BA74"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_88C9C0D87C7449108D65C94EB7B367FE"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -136,6 +154,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C51BB367E3764A609C6892AA7214BA74"
+            {
+            "SourcePath" = "8:..\\..\\..\\lib\\windows\\casa_authtoken.lib"
+            "TargetName" = "8:casa_authtoken.lib"
+            "Tag" = "8:"
+            "Folder" = "8:_468F7E7FDA88446E89ED9D270DBF29CF"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {
@@ -236,6 +274,34 @@
         }
         "ProjectOutput"
         {
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_88C9C0D87C7449108D65C94EB7B367FE"
+            {
+            "SourcePath" = "8:..\\..\\..\\csharp-api\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_468F7E7FDA88446E89ED9D270DBF29CF"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{1BA1FC97-5AF1-4506-A7FD-EBFD46D361A0}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
         }
         "Registry"
         {