diff --git a/CASA/Makefile.am b/CASA/Makefile.am
index aa1d1480..ca4a9fc8 100644
--- a/CASA/Makefile.am
+++ b/CASA/Makefile.am
@@ -60,7 +60,7 @@ installcheck-summary:
 clean-local:
 	rm -rf *.suo $(CASALIBDIR) 
 	rm -rf *.suo $(CASABINDIR)
-	
+	rm -rf BUILT	
 maintainer-clean-local:
 	rm -f configure Makefile.in casa-*.tar.gz
 	rm -f aclocal.m4 conf*.sh configure.lineno
diff --git a/CASA/adlib/Novell.CASA.A-D.csproj b/CASA/adlib/Novell.CASA.A-D.csproj
index 84763477..a6cb2f6c 100644
--- a/CASA/adlib/Novell.CASA.A-D.csproj
+++ b/CASA/adlib/Novell.CASA.A-D.csproj
@@ -94,41 +94,35 @@
                     Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
+                <Reference
+                    Name = "pango-sharp"
+                    AssemblyName = "pango-sharp"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
+                />
                 <Reference
                     Name = "atk-sharp"
                     AssemblyName = "atk-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
                 />
                 <Reference
                     Name = "gdk-sharp"
                     AssemblyName = "gdk-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
                 />
                 <Reference
                     Name = "glade-sharp"
                     AssemblyName = "glade-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
                 />
                 <Reference
                     Name = "glib-sharp"
                     AssemblyName = "glib-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
                 />
                 <Reference
                     Name = "gtk-sharp"
                     AssemblyName = "gtk-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
-                />
-                <Reference
-                    Name = "pango-sharp"
-                    AssemblyName = "pango-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
                 />
             </References>
         </Build>
diff --git a/CASA/adlib/Novell.CASA.A-D.csproj.user b/CASA/adlib/Novell.CASA.A-D.csproj.user
index 0e89b7e9..260b515b 100755
--- a/CASA/adlib/Novell.CASA.A-D.csproj.user
+++ b/CASA/adlib/Novell.CASA.A-D.csproj.user
@@ -1,7 +1,7 @@
 <VisualStudioProject>
     <CSHARP LastOpenVersion = "7.10.3077" >
         <Build>
-            <Settings ReferencePath = "" >
+            <Settings ReferencePath = "C:\GtkRun\2.8\lib\gtk-sharp-2.0\" >
                 <Config
                     Name = "Debug"
                     EnableASPDebugging = "false"
diff --git a/CASA/common/windows/Makefile.am b/CASA/common/windows/Makefile.am
index 4a773384..bd384d65 100755
--- a/CASA/common/windows/Makefile.am
+++ b/CASA/common/windows/Makefile.am
@@ -83,7 +83,7 @@ $(OBJDIR)/%.o: %.cpp
 
 $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): 
 	@echo [========  Creating symlink $@ ========]
-	ln -f $(CFILES) $(CASAROOT)/c_micasadk      	
+	ln -f $(CFILES) $(CASAROOT)/micasadk      	
 
 $(OBJDIR):
 	[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
diff --git a/CASA/gui/CASAManager.csproj b/CASA/gui/CASAManager.csproj
index 19a127f9..ac062d62 100644
--- a/CASA/gui/CASAManager.csproj
+++ b/CASA/gui/CASAManager.csproj
@@ -109,41 +109,35 @@
                     Project = "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
-                <Reference
-                    Name = "atk-sharp"
-                    AssemblyName = "atk-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
-                />
-                <Reference
-                    Name = "gdk-sharp"
-                    AssemblyName = "gdk-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
-                />
-                <Reference
-                    Name = "glade-sharp"
-                    AssemblyName = "glade-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
-                />
                 <Reference
                     Name = "glib-sharp"
                     AssemblyName = "glib-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
                 />
                 <Reference
                     Name = "gtk-sharp"
                     AssemblyName = "gtk-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
                 />
                 <Reference
                     Name = "pango-sharp"
                     AssemblyName = "pango-sharp"
-                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
-                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
+                />
+                <Reference
+                    Name = "atk-sharp"
+                    AssemblyName = "atk-sharp"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
+                />
+                <Reference
+                    Name = "gdk-sharp"
+                    AssemblyName = "gdk-sharp"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
+                />
+                <Reference
+                    Name = "glade-sharp"
+                    AssemblyName = "glade-sharp"
+                    HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
                 />
             </References>
         </Build>
diff --git a/CASA/gui/CASAManager.csproj.user b/CASA/gui/CASAManager.csproj.user
index c5e854e2..7b8badea 100644
--- a/CASA/gui/CASAManager.csproj.user
+++ b/CASA/gui/CASAManager.csproj.user
@@ -1,7 +1,7 @@
 <VisualStudioProject>
     <CSHARP LastOpenVersion = "7.10.3077" >
         <Build>
-            <Settings ReferencePath = "" >
+            <Settings ReferencePath = "C:\GtkRun\2.8\lib\gtk-sharp-2.0\" >
                 <Config
                     Name = "Debug"
                     EnableASPDebugging = "false"
diff --git a/CASA/micasacache/windows/Makefile.am b/CASA/micasacache/windows/Makefile.am
index 55d7cfbf..8be9c9d3 100755
--- a/CASA/micasacache/windows/Makefile.am
+++ b/CASA/micasacache/windows/Makefile.am
@@ -52,7 +52,7 @@ PLATFORMDEPENDENTSOURCEDIR = .
 MODULE_NAME =micasacache
 MODULE_EXT =dll
 
-SFILES = $(CASAROOT)/vs_solutions/CASAInstall/CASA.sln
+SFILES = $(CASAROOT)/package/windows/vs_solutions/CASAInstall/CASA.sln
  
 PROJECT_NAME= micasacache 
 
diff --git a/CASA/micasad/micasad.csproj b/CASA/micasad/micasad.csproj
index 08b61105..f015f932 100644
--- a/CASA/micasad/micasad.csproj
+++ b/CASA/micasad/micasad.csproj
@@ -260,7 +260,7 @@
                 />
                 <File
                     RelPath = "init\ProjectInstaller.cs"
-                    SubType = "Component"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
@@ -270,7 +270,7 @@
                 />
                 <File
                     RelPath = "init\WinSecretStoreClientService.cs"
-                    SubType = "Component"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
diff --git a/CASA/micasadk/windows/Makefile.am b/CASA/micasadk/windows/Makefile.am
index 69971238..33fb8be8 100755
--- a/CASA/micasadk/windows/Makefile.am
+++ b/CASA/micasadk/windows/Makefile.am
@@ -52,7 +52,7 @@ PLATFORMDEPENDENTSOURCEDIR = .
 MODULE_NAME =micasa
 MODULE_EXT =dll
 
-SFILES = $(CASAROOT)/vs_solutions/CASAInstall/CASA.sln
+SFILES = $(CASAROOT)/package/windows/vs_solutions/CASAInstall/CASA.sln
  
 PROJECT_NAME= micasa 
 
diff --git a/CASA/package/windows/vs_solutions/CASAInstall/CASA.ncb b/CASA/package/windows/vs_solutions/CASAInstall/CASA.ncb
index 83ac0aa2..fdb62357 100644
Binary files a/CASA/package/windows/vs_solutions/CASAInstall/CASA.ncb and b/CASA/package/windows/vs_solutions/CASAInstall/CASA.ncb differ
diff --git a/CASA/package/windows/vs_solutions/CASAInstall/CASA.suo b/CASA/package/windows/vs_solutions/CASAInstall/CASA.suo
index 3563efd5..7b1be823 100644
Binary files a/CASA/package/windows/vs_solutions/CASAInstall/CASA.suo and b/CASA/package/windows/vs_solutions/CASAInstall/CASA.suo differ
diff --git a/CASA/package/windows/vs_solutions/CASAInstall/CASA.vdproj b/CASA/package/windows/vs_solutions/CASAInstall/CASA.vdproj
index 47820c20..5aa1fa45 100644
--- a/CASA/package/windows/vs_solutions/CASAInstall/CASA.vdproj
+++ b/CASA/package/windows/vs_solutions/CASAInstall/CASA.vdproj
@@ -302,13 +302,13 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:CASA"
-        "ProductCode" = "8:{E87F8885-C799-4C0A-9761-8514A8A09C46}"
-        "PackageCode" = "8:{8D36149E-F746-4006-A4FA-3E6745D36021}"
+        "ProductCode" = "8:{E98F34B3-D061-4060-870F-42EA2959E74C}"
+        "PackageCode" = "8:{E98F34B3-D061-4060-870F-42EA2959E74C}"
         "UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
-        "ProductVersion" = "8:1.6.699"
+        "ProductVersion" = "8:1.7.678"
         "Manufacturer" = "8:Novell"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
diff --git a/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am b/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am
index aa17b68b..b1e6e29b 100755
--- a/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am
+++ b/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am
@@ -31,7 +31,7 @@ DIST_SUBDIRS =
 
 EXTRA_DIST = $(SFILES)  
 
-CASAROOT = ../..
+CASAROOT = ../../../..
 
 CASALIBDIR = $(CASAROOT)/lib
 
@@ -109,7 +109,7 @@ clean-local:
 	if [ -d Debug ]; then  rm -rf Debug; fi
 	if [ -f build.log ]; then  rm -f build.log; fi
 	if [ -d BUILT ]; then rm -rf BUILT; fi
-
+	if [ -f $(PACKAGE)-$(VERSION).tar.bz2 ]; then rm -f $(PACKAGE)-$(VERSION).tar.bz2; fi
 distclean-local:
 
 maintainer-clean-local:
diff --git a/CASA/package/windows/vs_solutions/CASAManager/CASAManager.suo b/CASA/package/windows/vs_solutions/CASAManager/CASAManager.suo
index 7d825b3d..4cd18ab7 100644
Binary files a/CASA/package/windows/vs_solutions/CASAManager/CASAManager.suo and b/CASA/package/windows/vs_solutions/CASAManager/CASAManager.suo differ
diff --git a/CASA/package/windows/vs_solutions/miCASA-msm/miCASA-msm.vdproj b/CASA/package/windows/vs_solutions/miCASA-msm/miCASA-msm.vdproj
index 9f8598a7..1cd974a6 100644
--- a/CASA/package/windows/vs_solutions/miCASA-msm/miCASA-msm.vdproj
+++ b/CASA/package/windows/vs_solutions/miCASA-msm/miCASA-msm.vdproj
@@ -1934,8 +1934,8 @@
         }
         "Module"
         {
-        "ModuleSignature" = "8:MergeModule.71E87B6C0C774E9FBADBFDACFC28E60A"
-        "Version" = "8:1.5.0.0"
+        "ModuleSignature" = "8:MergeModule.23882DEA21CB4D9C85AFFC59560C0630"
+        "Version" = "8:1.7.678.0"
         "Title" = "8:miCASA-msm"
         "Subject" = "8:"
         "Author" = "8:Organization"