diff --git a/CASA/package/windows/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj b/CASA/package/windows/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj
index eeeed185..a47c376a 100644
--- a/CASA/package/windows/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj
+++ b/CASA/package/windows/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj
@@ -13,6 +13,12 @@
 "SccProvider" = "8:"
     "Hierarchy"
     {
+        "Entry"
+        {
+        "MsmKey" = "8:_0B67DCE2A3EA44EE95E6E35B1155C4D4"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
         "Entry"
         {
         "MsmKey" = "8:_24DA7E000C1645438F67455260F5A201"
@@ -27,14 +33,8 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_4CF0917F390ACC0AF5A1750516A3993E"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_4CF0917F390ACC0AF5A1750516A3993E"
-        "OwnerKey" = "8:_A1ECD7DAF522A0E5D85BCDD9EAED3209"
+        "MsmKey" = "8:_4CA6C9BB20C542A1B856271245513CC1"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -45,24 +45,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_79C6F8F43FF4CB3AF63B925D0EA1C564"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_79C6F8F43FF4CB3AF63B925D0EA1C564"
-        "OwnerKey" = "8:_4CF0917F390ACC0AF5A1750516A3993E"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_79C6F8F43FF4CB3AF63B925D0EA1C564"
-        "OwnerKey" = "8:_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_9630BD80B06842BB9DE27916F038665C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -75,62 +57,20 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_A1ECD7DAF522A0E5D85BCDD9EAED3209"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_A7A23CA536234B8BAE08CA9528EC8F93"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_BFB5523F92C62717D5FFB02E609341F7"
-        "OwnerKey" = "8:_384A908A3DE54B359C611011C2A2AA97"
+        "MsmKey" = "8:_BC2F0CC1092E45A3B9292CFAA9BE30C7"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C071E033A8B0450E833BB5FB786E1027"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C071E033A8B0450E833BB5FB786E1027"
-        "OwnerKey" = "8:_A1ECD7DAF522A0E5D85BCDD9EAED3209"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C071E033A8B0450E833BB5FB786E1027"
-        "OwnerKey" = "8:_4CF0917F390ACC0AF5A1750516A3993E"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C071E033A8B0450E833BB5FB786E1027"
-        "OwnerKey" = "8:_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C071E033A8B0450E833BB5FB786E1027"
-        "OwnerKey" = "8:_79C6F8F43FF4CB3AF63B925D0EA1C564"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
-        "OwnerKey" = "8:_4CF0917F390ACC0AF5A1750516A3993E"
+        "MsmKey" = "8:_EE232DF9B4BC45A4930DB0E636A09A53"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -202,23 +142,12 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_4CF0917F390ACC0AF5A1750516A3993E"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_4CA6C9BB20C542A1B856271245513CC1"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.6.2356.23746, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_4CF0917F390ACC0AF5A1750516A3993E"
-                    {
-                    "Name" = "8:Novell.CASA.Common.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Novell.CASA.Common.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:..\\..\\..\\..\\include\\casa_status.h"
+            "TargetName" = "8:casa_status.h"
             "Tag" = "8:"
-            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
+            "Folder" = "8:_74C8706957E54C25B02C3025A6FE7488"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -230,38 +159,7 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_79C6F8F43FF4CB3AF63B925D0EA1C564"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:AppModule.InterProcessComm, Version=1.6.0.23746, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_79C6F8F43FF4CB3AF63B925D0EA1C564"
-                    {
-                    "Name" = "8:AppModule.InterProcessComm.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:AppModule.InterProcessComm.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
-            "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:TRUE"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_9630BD80B06842BB9DE27916F038665C"
@@ -304,37 +202,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_A1ECD7DAF522A0E5D85BCDD9EAED3209"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.6.2356.23750, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_A1ECD7DAF522A0E5D85BCDD9EAED3209"
-                    {
-                    "Name" = "8:Novell.CASA.miCASAWrapper.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Novell.CASA.miCASAWrapper.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
-            "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:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_A7A23CA536234B8BAE08CA9528EC8F93"
             {
             "SourcePath" = "8:..\\..\\..\\..\\include\\micasa_types.h"
@@ -355,12 +222,12 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_BFB5523F92C62717D5FFB02E609341F7"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_BC2F0CC1092E45A3B9292CFAA9BE30C7"
             {
-            "SourcePath" = "8:micasa.dll"
-            "TargetName" = "8:micasa.dll"
+            "SourcePath" = "8:..\\..\\..\\..\\include\\micasa.h"
+            "TargetName" = "8:micasa.h"
             "Tag" = "8:"
-            "Folder" = "8:_F3F9192858114846913E6271C812F8FA"
+            "Folder" = "8:_74C8706957E54C25B02C3025A6FE7488"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -372,26 +239,15 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_EE232DF9B4BC45A4930DB0E636A09A53"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:AppModule.NamedPipes, Version=1.6.0.23746, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
-                    {
-                    "Name" = "8:AppModule.NamedPipes.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:AppModule.NamedPipes.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:..\\..\\..\\..\\include\\sscs_string.h"
+            "TargetName" = "8:sscs_string.h"
             "Tag" = "8:"
-            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
+            "Folder" = "8:_74C8706957E54C25B02C3025A6FE7488"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -403,7 +259,7 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
         }
@@ -542,7 +398,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_C071E033A8B0450E833BB5FB786E1027"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_0B67DCE2A3EA44EE95E6E35B1155C4D4"
             {
             "UseDynamicProperties" = "11:FALSE"
             "IsDependency" = "11:TRUE"
@@ -570,7 +426,7 @@
         {
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_384A908A3DE54B359C611011C2A2AA97"
             {
-            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sample\\Release\\cSample.exe"
+            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sample\\Debug\\cSample.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F3F9192858114846913E6271C812F8FA"
@@ -598,7 +454,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_718042C617DB414B91C69D1ACCD99A42"
             {
-            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sharp_sample\\obj\\Release\\CSharpSample.exe"
+            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sharp_sample\\obj\\Debug\\CSharpSample.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"