diff --git a/all.dsp b/all.dsp
index e2ce73d3..2358823a 100644
--- a/all.dsp
+++ b/all.dsp
@@ -44,8 +44,8 @@ MTL=midl.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "all___Win32_Debug"
-# PROP BASE Intermediate_Dir "all___Win32_Debug"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
diff --git a/cmd/exec.dsp b/cmd/exec.dsp
new file mode 100644
index 00000000..99fc73b7
--- /dev/null
+++ b/cmd/exec.dsp
@@ -0,0 +1,63 @@
+# Microsoft Developer Studio Project File - Name="exec" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Generic Project" 0x010a
+
+CFG=exec - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "exec.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "exec.mak" CFG="exec - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "exec - Win32 Release" (based on "Win32 (x86) Generic Project")
+!MESSAGE "exec - Win32 Debug" (based on "Win32 (x86) Generic Project")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+MTL=midl.exe
+
+!IF  "$(CFG)" == "exec - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "exec - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+
+!ENDIF 
+
+# Begin Target
+
+# Name "exec - Win32 Release"
+# Name "exec - Win32 Debug"
+# End Target
+# End Project
diff --git a/lib/platform/makehook.dsp b/lib/platform/makehook.dsp
index 507fa6e9..f14304a9 100644
--- a/lib/platform/makehook.dsp
+++ b/lib/platform/makehook.dsp
@@ -31,8 +31,8 @@ MTL=midl.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "makehook___Win32_Release"
-# PROP BASE Intermediate_Dir "makehook___Win32_Release"
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
@@ -44,8 +44,8 @@ MTL=midl.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "makehook___Win32_Debug"
-# PROP BASE Intermediate_Dir "makehook___Win32_Debug"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
diff --git a/lib/platform/synrgyhk.dsp b/lib/platform/synrgyhk.dsp
index cec6eaf9..54fcc6a7 100644
--- a/lib/platform/synrgyhk.dsp
+++ b/lib/platform/synrgyhk.dsp
@@ -33,8 +33,8 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "synrgyhk___Win32_Release"
-# PROP BASE Intermediate_Dir "synrgyhk___Win32_Release"
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
@@ -61,8 +61,8 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "synrgyhk___Win32_Debug"
-# PROP BASE Intermediate_Dir "synrgyhk___Win32_Debug"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
diff --git a/synergy.dsw b/synergy.dsw
index a70a4d76..7148711f 100644
--- a/synergy.dsw
+++ b/synergy.dsw
@@ -3,7 +3,70 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "all"=.\all.dsp - Package Owner=<4>
+Project: "all"=".\all.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name launcher
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "arch"=".\lib\arch\arch.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "base"=".\lib\base\base.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "client"=".\lib\client\client.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "common"=".\lib\common\common.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "exec"=".\cmd\exec.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -17,14 +80,11 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name synergys
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name launcher
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "arch"=.\lib\arch\arch.dsp - Package Owner=<4>
+Project: "http"=".\lib\HTTP\http.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -36,7 +96,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "base"=.\lib\base\base.dsp - Package Owner=<4>
+Project: "io"=".\lib\io\io.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -48,55 +108,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "client"=.\lib\client\client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "common"=.\lib\common\common.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "http"=.\lib\HTTP\http.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "io"=.\lib\io\io.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "launcher"=.\cmd\launcher\launcher.dsp - Package Owner=<4>
+Project: "launcher"=".\cmd\launcher\launcher.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -131,11 +143,14 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name server
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name exec
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "libsynergy"=.\lib\synergy\libsynergy.dsp - Package Owner=<4>
+Project: "libsynergy"=".\lib\synergy\libsynergy.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -147,7 +162,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "makehook"=.\lib\platform\makehook.dsp - Package Owner=<4>
+Project: "makehook"=".\lib\platform\makehook.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -162,7 +177,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mt"=.\lib\mt\mt.dsp - Package Owner=<4>
+Project: "mt"=".\lib\mt\mt.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -174,7 +189,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "net"=.\lib\net\net.dsp - Package Owner=<4>
+Project: "net"=".\lib\net\net.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -186,7 +201,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "platform"=.\lib\platform\platform.dsp - Package Owner=<4>
+Project: "platform"=".\lib\platform\platform.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -198,7 +213,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "server"=.\lib\server\server.dsp - Package Owner=<4>
+Project: "server"=".\lib\server\server.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -210,7 +225,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "synergyc"=.\cmd\synergyc\synergyc.dsp - Package Owner=<4>
+Project: "synergyc"=".\cmd\synergyc\synergyc.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -249,7 +264,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "synergys"=.\cmd\synergys\synergys.dsp - Package Owner=<4>
+Project: "synergys"=".\cmd\synergys\synergys.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -294,7 +309,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "synrgyhk"=.\lib\platform\synrgyhk.dsp - Package Owner=<4>
+Project: "synrgyhk"=".\lib\platform\synrgyhk.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{