From d0e75920f1529daba599fd939edb05ce8311bbf6 Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Fri, 6 Apr 2007 23:53:59 +0000
Subject: [PATCH] Moved VC++ project files into vcproj subdirectory.

---
 platform/win32/contiki.sln                    |  58 +++----
 platform/win32/{ => vcproj}/about.dsc.vcproj  |  10 +-
 platform/win32/{ => vcproj}/about.prg.vcproj  |  14 +-
 platform/win32/{ => vcproj}/calc.dsc.vcproj   |  10 +-
 platform/win32/{ => vcproj}/calc.prg.vcproj   |  10 +-
 .../win32/{ => vcproj}/contiki.exe.vcproj     | 150 +++++++++---------
 platform/win32/{ => vcproj}/dhcp.dsc.vcproj   |  10 +-
 platform/win32/{ => vcproj}/dhcp.prg.vcproj   |  14 +-
 .../win32/{ => vcproj}/directory.dsc.vcproj   |  10 +-
 .../win32/{ => vcproj}/directory.prg.vcproj   |  10 +-
 platform/win32/{ => vcproj}/email.dsc.vcproj  |  10 +-
 platform/win32/{ => vcproj}/email.prg.vcproj  |  26 +--
 platform/win32/{ => vcproj}/ftp.dsc.vcproj    |  10 +-
 platform/win32/{ => vcproj}/ftp.prg.vcproj    |  18 +--
 platform/win32/{ => vcproj}/irc.dsc.vcproj    |  10 +-
 platform/win32/{ => vcproj}/irc.prg.vcproj    |  26 +--
 .../win32/{ => vcproj}/netconf.dsc.vcproj     |  10 +-
 .../win32/{ => vcproj}/netconf.prg.vcproj     |  10 +-
 .../win32/{ => vcproj}/processes.dsc.vcproj   |  10 +-
 .../win32/{ => vcproj}/processes.prg.vcproj   |  10 +-
 platform/win32/{ => vcproj}/shell.dsc.vcproj  |  10 +-
 platform/win32/{ => vcproj}/shell.prg.vcproj  |  18 +--
 platform/win32/{ => vcproj}/telnet.dsc.vcproj |  10 +-
 platform/win32/{ => vcproj}/telnet.prg.vcproj |  16 +-
 .../win32/{ => vcproj}/webserver.dsc.vcproj   |  10 +-
 .../win32/{ => vcproj}/webserver.prg.vcproj   |  36 ++---
 platform/win32/{ => vcproj}/wpcap.drv.vcproj  |  16 +-
 platform/win32/{ => vcproj}/wpcap.dsc.vcproj  |  10 +-
 platform/win32/{ => vcproj}/www.dsc.vcproj    |  10 +-
 platform/win32/{ => vcproj}/www.prg.vcproj    |  36 ++---
 30 files changed, 308 insertions(+), 300 deletions(-)
 rename platform/win32/{ => vcproj}/about.dsc.vcproj (92%)
 rename platform/win32/{ => vcproj}/about.prg.vcproj (89%)
 rename platform/win32/{ => vcproj}/calc.dsc.vcproj (92%)
 rename platform/win32/{ => vcproj}/calc.prg.vcproj (91%)
 rename platform/win32/{ => vcproj}/contiki.exe.vcproj (61%)
 rename platform/win32/{ => vcproj}/dhcp.dsc.vcproj (92%)
 rename platform/win32/{ => vcproj}/dhcp.prg.vcproj (89%)
 rename platform/win32/{ => vcproj}/directory.dsc.vcproj (91%)
 rename platform/win32/{ => vcproj}/directory.prg.vcproj (91%)
 rename platform/win32/{ => vcproj}/email.dsc.vcproj (92%)
 rename platform/win32/{ => vcproj}/email.prg.vcproj (83%)
 rename platform/win32/{ => vcproj}/ftp.dsc.vcproj (92%)
 rename platform/win32/{ => vcproj}/ftp.prg.vcproj (87%)
 rename platform/win32/{ => vcproj}/irc.dsc.vcproj (92%)
 rename platform/win32/{ => vcproj}/irc.prg.vcproj (83%)
 rename platform/win32/{ => vcproj}/netconf.dsc.vcproj (91%)
 rename platform/win32/{ => vcproj}/netconf.prg.vcproj (91%)
 rename platform/win32/{ => vcproj}/processes.dsc.vcproj (91%)
 rename platform/win32/{ => vcproj}/processes.prg.vcproj (90%)
 rename platform/win32/{ => vcproj}/shell.dsc.vcproj (92%)
 rename platform/win32/{ => vcproj}/shell.prg.vcproj (86%)
 rename platform/win32/{ => vcproj}/telnet.dsc.vcproj (92%)
 rename platform/win32/{ => vcproj}/telnet.prg.vcproj (87%)
 rename platform/win32/{ => vcproj}/webserver.dsc.vcproj (91%)
 rename platform/win32/{ => vcproj}/webserver.prg.vcproj (79%)
 rename platform/win32/{ => vcproj}/wpcap.drv.vcproj (88%)
 rename platform/win32/{ => vcproj}/wpcap.dsc.vcproj (92%)
 rename platform/win32/{ => vcproj}/www.dsc.vcproj (91%)
 rename platform/win32/{ => vcproj}/www.prg.vcproj (78%)

diff --git a/platform/win32/contiki.sln b/platform/win32/contiki.sln
index fbdb42bf5..9c4d07e11 100644
--- a/platform/win32/contiki.sln
+++ b/platform/win32/contiki.sln
@@ -1,102 +1,102 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "contiki.exe", "contiki.exe.vcproj", "{DD219C2D-D3F8-4C76-B2AA-376978722232}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "contiki.exe", "vcproj\contiki.exe.vcproj", "{DD219C2D-D3F8-4C76-B2AA-376978722232}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "about.dsc", "about.dsc.vcproj", "{D94905DB-27DB-4053-9760-9ADBC64F656A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "about.dsc", "vcproj\about.dsc.vcproj", "{D94905DB-27DB-4053-9760-9ADBC64F656A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "about.prg", "about.prg.vcproj", "{39E33545-D63F-4FBE-A7A1-5077AC704EB1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "about.prg", "vcproj\about.prg.vcproj", "{39E33545-D63F-4FBE-A7A1-5077AC704EB1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calc.dsc", "calc.dsc.vcproj", "{3F1FB015-FE4C-45DC-93B2-6CB03AA672F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calc.dsc", "vcproj\calc.dsc.vcproj", "{3F1FB015-FE4C-45DC-93B2-6CB03AA672F7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calc.prg", "calc.prg.vcproj", "{5A82FB85-CA5E-4ABE-95DD-6966E120E05E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calc.prg", "vcproj\calc.prg.vcproj", "{5A82FB85-CA5E-4ABE-95DD-6966E120E05E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dhcp.dsc", "dhcp.dsc.vcproj", "{881CD2B8-5729-4F3A-A65B-BD5995329CA0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dhcp.dsc", "vcproj\dhcp.dsc.vcproj", "{881CD2B8-5729-4F3A-A65B-BD5995329CA0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dhcp.prg", "dhcp.prg.vcproj", "{DAD91041-E4DE-42FE-9360-2237F03AB05C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dhcp.prg", "vcproj\dhcp.prg.vcproj", "{DAD91041-E4DE-42FE-9360-2237F03AB05C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directory.dsc", "directory.dsc.vcproj", "{41417495-F60E-47CC-BDEF-4B9614E5DA08}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directory.dsc", "vcproj\directory.dsc.vcproj", "{41417495-F60E-47CC-BDEF-4B9614E5DA08}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directory.prg", "directory.prg.vcproj", "{1EAF4006-F7AF-46E9-9390-43E0626CB4E5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directory.prg", "vcproj\directory.prg.vcproj", "{1EAF4006-F7AF-46E9-9390-43E0626CB4E5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "email.dsc", "email.dsc.vcproj", "{9929C46F-F0B8-408C-8455-3ED425EE3F23}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "email.dsc", "vcproj\email.dsc.vcproj", "{9929C46F-F0B8-408C-8455-3ED425EE3F23}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "email.prg", "email.prg.vcproj", "{04A1BFE8-B685-4D22-8AFB-BB47D80E6BDD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "email.prg", "vcproj\email.prg.vcproj", "{04A1BFE8-B685-4D22-8AFB-BB47D80E6BDD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftp.dsc", "ftp.dsc.vcproj", "{1D1C715A-6C61-42BA-B972-0F7DA80CCD6F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftp.dsc", "vcproj\ftp.dsc.vcproj", "{1D1C715A-6C61-42BA-B972-0F7DA80CCD6F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftp.prg", "ftp.prg.vcproj", "{4D40467F-D97B-4CB8-B340-928A85FC2721}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftp.prg", "vcproj\ftp.prg.vcproj", "{4D40467F-D97B-4CB8-B340-928A85FC2721}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "irc.dsc", "irc.dsc.vcproj", "{54D09D67-89E9-417C-9C52-685C18A9F399}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "irc.dsc", "vcproj\irc.dsc.vcproj", "{54D09D67-89E9-417C-9C52-685C18A9F399}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "irc.prg", "irc.prg.vcproj", "{2F1E7C4F-3FDA-437F-82D4-F3BC9D145DAE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "irc.prg", "vcproj\irc.prg.vcproj", "{2F1E7C4F-3FDA-437F-82D4-F3BC9D145DAE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netconf.dsc", "netconf.dsc.vcproj", "{202EFB35-1D34-4CCB-8DD9-9BE1D5D31D0D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netconf.dsc", "vcproj\netconf.dsc.vcproj", "{202EFB35-1D34-4CCB-8DD9-9BE1D5D31D0D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netconf.prg", "netconf.prg.vcproj", "{EAF263A5-CD3F-454D-984C-C85AD604F1EF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netconf.prg", "vcproj\netconf.prg.vcproj", "{EAF263A5-CD3F-454D-984C-C85AD604F1EF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processes.dsc", "processes.dsc.vcproj", "{E5D69749-8BA3-45C0-85D6-277C8ED1736B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processes.dsc", "vcproj\processes.dsc.vcproj", "{E5D69749-8BA3-45C0-85D6-277C8ED1736B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processes.prg", "processes.prg.vcproj", "{F6F06B52-2D04-4486-88AF-F3698AC85F6E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processes.prg", "vcproj\processes.prg.vcproj", "{F6F06B52-2D04-4486-88AF-F3698AC85F6E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell.dsc", "shell.dsc.vcproj", "{6F41B3DA-96D9-4431-B53B-2F91893E7B69}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell.dsc", "vcproj\shell.dsc.vcproj", "{6F41B3DA-96D9-4431-B53B-2F91893E7B69}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell.prg", "shell.prg.vcproj", "{54FB8E12-5558-460C-BC6E-9D67D8A564E8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell.prg", "vcproj\shell.prg.vcproj", "{54FB8E12-5558-460C-BC6E-9D67D8A564E8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "telnet.dsc", "telnet.dsc.vcproj", "{79094763-B380-4072-B475-2A5019474C2B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "telnet.dsc", "vcproj\telnet.dsc.vcproj", "{79094763-B380-4072-B475-2A5019474C2B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "telnet.prg", "telnet.prg.vcproj", "{C511175A-BD2B-4ED9-87A6-05040E4DD823}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "telnet.prg", "vcproj\telnet.prg.vcproj", "{C511175A-BD2B-4ED9-87A6-05040E4DD823}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webserver.dsc", "webserver.dsc.vcproj", "{BE742A25-4F10-4741-B307-850C61BE0883}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webserver.dsc", "vcproj\webserver.dsc.vcproj", "{BE742A25-4F10-4741-B307-850C61BE0883}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webserver.prg", "webserver.prg.vcproj", "{C741203A-ADD3-4C4A-9BF1-82978105F057}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webserver.prg", "vcproj\webserver.prg.vcproj", "{C741203A-ADD3-4C4A-9BF1-82978105F057}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpcap.drv", "wpcap.drv.vcproj", "{39F3E492-1EE3-4904-8962-D482011AB375}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpcap.drv", "vcproj\wpcap.drv.vcproj", "{39F3E492-1EE3-4904-8962-D482011AB375}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpcap.dsc", "wpcap.dsc.vcproj", "{618101EC-0777-4FA6-B1B7-3B7C1981707B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpcap.dsc", "vcproj\wpcap.dsc.vcproj", "{618101EC-0777-4FA6-B1B7-3B7C1981707B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "www.dsc", "www.dsc.vcproj", "{76D7F9A9-9C9E-41C9-9BF8-DB305BCEEF71}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "www.dsc", "vcproj\www.dsc.vcproj", "{76D7F9A9-9C9E-41C9-9BF8-DB305BCEEF71}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "www.prg", "www.prg.vcproj", "{2A1D67D7-7FAE-42D3-AC99-DB68A3570735}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "www.prg", "vcproj\www.prg.vcproj", "{2A1D67D7-7FAE-42D3-AC99-DB68A3570735}"
 	ProjectSection(ProjectDependencies) = postProject
 		{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
 	EndProjectSection
diff --git a/platform/win32/about.dsc.vcproj b/platform/win32/vcproj/about.dsc.vcproj
similarity index 92%
rename from platform/win32/about.dsc.vcproj
rename to platform/win32/vcproj/about.dsc.vcproj
index be23e9096..969059643 100644
--- a/platform/win32/about.dsc.vcproj
+++ b/platform/win32/vcproj/about.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\about\about-dsc.c"
+			RelativePath="..\..\..\apps\about\about-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/about.prg.vcproj b/platform/win32/vcproj/about.prg.vcproj
similarity index 89%
rename from platform/win32/about.prg.vcproj
rename to platform/win32/vcproj/about.prg.vcproj
index c3a8d1d43..1f419de64 100644
--- a/platform/win32/about.prg.vcproj
+++ b/platform/win32/vcproj/about.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -175,14 +175,14 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\about\about.c"
+			RelativePath="..\..\..\apps\about\about.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=".;../../core"
+					AdditionalIncludeDirectories="..;../../../core"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -190,7 +190,7 @@
 				>
 				<Tool
 					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=".;../../core"
+					AdditionalIncludeDirectories="..;../../../core"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/platform/win32/calc.dsc.vcproj b/platform/win32/vcproj/calc.dsc.vcproj
similarity index 92%
rename from platform/win32/calc.dsc.vcproj
rename to platform/win32/vcproj/calc.dsc.vcproj
index 0e5cd7b91..84a2445a5 100644
--- a/platform/win32/calc.dsc.vcproj
+++ b/platform/win32/vcproj/calc.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\calc\calc-dsc.c"
+			RelativePath="..\..\..\apps\calc\calc-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/calc.prg.vcproj b/platform/win32/vcproj/calc.prg.vcproj
similarity index 91%
rename from platform/win32/calc.prg.vcproj
rename to platform/win32/vcproj/calc.prg.vcproj
index 885ab2ba8..e026b758a 100644
--- a/platform/win32/calc.prg.vcproj
+++ b/platform/win32/vcproj/calc.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -175,7 +175,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\calc\calc.c"
+			RelativePath="..\..\..\apps\calc\calc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/contiki.exe.vcproj b/platform/win32/vcproj/contiki.exe.vcproj
similarity index 61%
rename from platform/win32/contiki.exe.vcproj
rename to platform/win32/vcproj/contiki.exe.vcproj
index 2f9e4c533..c68a9d7e0 100644
--- a/platform/win32/contiki.exe.vcproj
+++ b/platform/win32/vcproj/contiki.exe.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -94,7 +94,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -116,7 +116,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -179,11 +179,11 @@
 				Name="program-handler"
 				>
 				<File
-					RelativePath="..\..\apps\program-handler\program-handler.c"
+					RelativePath="..\..\..\apps\program-handler\program-handler.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apps\program-handler\program-handler.h"
+					RelativePath="..\..\..\apps\program-handler\program-handler.h"
 					>
 				</File>
 			</Filter>
@@ -191,11 +191,11 @@
 				Name="webbrowser"
 				>
 				<File
-					RelativePath="..\..\apps\webbrowser\www-dsc.c"
+					RelativePath="..\..\..\apps\webbrowser\www-dsc.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apps\webbrowser\www-dsc.h"
+					RelativePath="..\..\..\apps\webbrowser\www-dsc.h"
 					>
 				</File>
 			</Filter>
@@ -203,11 +203,11 @@
 				Name="directory"
 				>
 				<File
-					RelativePath="..\..\apps\directory\directory-dsc.c"
+					RelativePath="..\..\..\apps\directory\directory-dsc.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apps\directory\directory-dsc.h"
+					RelativePath="..\..\..\apps\directory\directory-dsc.h"
 					>
 				</File>
 			</Filter>
@@ -216,30 +216,30 @@
 			Name="core"
 			>
 			<File
-				RelativePath="..\..\core\contiki-lib.h"
+				RelativePath="..\..\..\core\contiki-lib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\contiki-net.h"
+				RelativePath="..\..\..\core\contiki-net.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\contiki-version.h"
+				RelativePath="..\..\..\core\contiki-version.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\contiki.h"
+				RelativePath="..\..\..\core\contiki.h"
 				>
 			</File>
 			<Filter
 				Name="cfs"
 				>
 				<File
-					RelativePath="..\..\core\cfs\cfs.c"
+					RelativePath="..\..\..\core\cfs\cfs.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\cfs\cfs.h"
+					RelativePath="..\..\..\core\cfs\cfs.h"
 					>
 				</File>
 			</Filter>
@@ -247,31 +247,35 @@
 				Name="ctk"
 				>
 				<File
-					RelativePath="..\..\core\ctk\ctk-conio-service.c"
+					RelativePath="..\..\..\core\ctk\ctk-conio-service.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\ctk\ctk-conio-service.h"
+					RelativePath="..\..\..\core\ctk\ctk-conio-service.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\ctk\ctk-draw-service.h"
+					RelativePath="..\..\..\core\ctk\ctk-draw-service.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\ctk\ctk-draw.c"
+					RelativePath="..\..\..\core\ctk\ctk-draw.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\ctk\ctk-draw.h"
+					RelativePath="..\..\..\core\ctk\ctk-draw.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\ctk\ctk.c"
+					RelativePath="..\..\..\core\ctk\ctk-mouse.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\ctk\ctk.h"
+					RelativePath="..\..\..\core\ctk\ctk.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\core\ctk\ctk.h"
 					>
 				</File>
 			</Filter>
@@ -279,27 +283,27 @@
 				Name="lib"
 				>
 				<File
-					RelativePath="..\..\core\lib\energest.h"
+					RelativePath="..\..\..\core\lib\energest.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\lib\list.h"
+					RelativePath="..\..\..\core\lib\list.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\lib\memb.h"
+					RelativePath="..\..\..\core\lib\memb.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\lib\mmem.h"
+					RelativePath="..\..\..\core\lib\mmem.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\lib\petsciiconv.h"
+					RelativePath="..\..\..\core\lib\petsciiconv.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\lib\random.h"
+					RelativePath="..\..\..\core\lib\random.h"
 					>
 				</File>
 			</Filter>
@@ -307,71 +311,71 @@
 				Name="net"
 				>
 				<File
-					RelativePath="..\..\core\net\packet-service.h"
+					RelativePath="..\..\..\core\net\packet-service.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\psock.h"
+					RelativePath="..\..\..\core\net\psock.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\resolv.c"
+					RelativePath="..\..\..\core\net\resolv.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\resolv.h"
+					RelativePath="..\..\..\core\net\resolv.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\tcpip.c"
+					RelativePath="..\..\..\core\net\tcpip.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\tcpip.h"
+					RelativePath="..\..\..\core\net\tcpip.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uip-fw.c"
+					RelativePath="..\..\..\core\net\uip-fw.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uip-fw.h"
+					RelativePath="..\..\..\core\net\uip-fw.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uip-split.c"
+					RelativePath="..\..\..\core\net\uip-split.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uip-split.h"
+					RelativePath="..\..\..\core\net\uip-split.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uip.c"
+					RelativePath="..\..\..\core\net\uip.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uip.h"
+					RelativePath="..\..\..\core\net\uip.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uip_arp.h"
+					RelativePath="..\..\..\core\net\uip_arp.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uipbuf.h"
+					RelativePath="..\..\..\core\net\uipbuf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uiplib.c"
+					RelativePath="..\..\..\core\net\uiplib.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uiplib.h"
+					RelativePath="..\..\..\core\net\uiplib.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\net\uipopt.h"
+					RelativePath="..\..\..\core\net\uipopt.h"
 					>
 				</File>
 			</Filter>
@@ -379,71 +383,71 @@
 				Name="sys"
 				>
 				<File
-					RelativePath="..\..\core\sys\autostart.h"
+					RelativePath="..\..\..\core\sys\autostart.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\cc.h"
+					RelativePath="..\..\..\core\sys\cc.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\clock.h"
+					RelativePath="..\..\..\core\sys\clock.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\dsc.h"
+					RelativePath="..\..\..\core\sys\dsc.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\etimer.c"
+					RelativePath="..\..\..\core\sys\etimer.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\etimer.h"
+					RelativePath="..\..\..\core\sys\etimer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\loader.h"
+					RelativePath="..\..\..\core\sys\loader.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\log.h"
+					RelativePath="..\..\..\core\sys\log.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\process.c"
+					RelativePath="..\..\..\core\sys\process.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\process.h"
+					RelativePath="..\..\..\core\sys\process.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\procinit.c"
+					RelativePath="..\..\..\core\sys\procinit.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\procinit.h"
+					RelativePath="..\..\..\core\sys\procinit.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\pt.h"
+					RelativePath="..\..\..\core\sys\pt.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\service.c"
+					RelativePath="..\..\..\core\sys\service.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\service.h"
+					RelativePath="..\..\..\core\sys\service.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\timer.c"
+					RelativePath="..\..\..\core\sys\timer.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\core\sys\timer.h"
+					RelativePath="..\..\..\core\sys\timer.h"
 					>
 				</File>
 			</Filter>
@@ -452,22 +456,26 @@
 			Name="win32"
 			>
 			<File
-				RelativePath=".\contiki-conf.h"
+				RelativePath="..\conio.h"
 				>
 			</File>
 			<File
-				RelativePath=".\contiki-main.c"
+				RelativePath="..\contiki-conf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\contiki-main.c"
 				>
 			</File>
 			<Filter
 				Name="cfs"
 				>
 				<File
-					RelativePath=".\cfs\cfs-win32.c"
+					RelativePath="..\cfs\cfs-win32.c"
 					>
 				</File>
 				<File
-					RelativePath=".\cfs\cfs-win32.h"
+					RelativePath="..\cfs\cfs-win32.h"
 					>
 				</File>
 			</Filter>
@@ -475,11 +483,11 @@
 				Name="ctk"
 				>
 				<File
-					RelativePath=".\ctk\ctk-console.c"
+					RelativePath="..\ctk\ctk-console.c"
 					>
 				</File>
 				<File
-					RelativePath=".\ctk\ctk-console.h"
+					RelativePath="..\ctk\ctk-console.h"
 					>
 				</File>
 			</Filter>
@@ -487,11 +495,11 @@
 				Name="loader"
 				>
 				<File
-					RelativePath=".\loader\dll-loader.c"
+					RelativePath="..\loader\dll-loader.c"
 					>
 				</File>
 				<File
-					RelativePath=".\loader\dll-loader.h"
+					RelativePath="..\loader\dll-loader.h"
 					>
 				</File>
 			</Filter>
diff --git a/platform/win32/dhcp.dsc.vcproj b/platform/win32/vcproj/dhcp.dsc.vcproj
similarity index 92%
rename from platform/win32/dhcp.dsc.vcproj
rename to platform/win32/vcproj/dhcp.dsc.vcproj
index a0a2aec1e..63161df01 100644
--- a/platform/win32/dhcp.dsc.vcproj
+++ b/platform/win32/vcproj/dhcp.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\dhcp\dhcp-dsc.c"
+			RelativePath="..\..\..\apps\dhcp\dhcp-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/dhcp.prg.vcproj b/platform/win32/vcproj/dhcp.prg.vcproj
similarity index 89%
rename from platform/win32/dhcp.prg.vcproj
rename to platform/win32/vcproj/dhcp.prg.vcproj
index 0976606ec..67509e33c 100644
--- a/platform/win32/dhcp.prg.vcproj
+++ b/platform/win32/vcproj/dhcp.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -178,16 +178,16 @@
 			Name="net"
 			>
 			<File
-				RelativePath="..\..\core\net\dhcpc.c"
+				RelativePath="..\..\..\core\net\dhcpc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\net\dhcpc.h"
+				RelativePath="..\..\..\core\net\dhcpc.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\apps\dhcp\dhcp.c"
+			RelativePath="..\..\..\apps\dhcp\dhcp.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/directory.dsc.vcproj b/platform/win32/vcproj/directory.dsc.vcproj
similarity index 91%
rename from platform/win32/directory.dsc.vcproj
rename to platform/win32/vcproj/directory.dsc.vcproj
index ad60eaf0a..cb76e03ea 100644
--- a/platform/win32/directory.dsc.vcproj
+++ b/platform/win32/vcproj/directory.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\directory\directory-dsc.c"
+			RelativePath="..\..\..\apps\directory\directory-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/directory.prg.vcproj b/platform/win32/vcproj/directory.prg.vcproj
similarity index 91%
rename from platform/win32/directory.prg.vcproj
rename to platform/win32/vcproj/directory.prg.vcproj
index a067a7ebc..360138ae3 100644
--- a/platform/win32/directory.prg.vcproj
+++ b/platform/win32/vcproj/directory.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -175,7 +175,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\directory\directory.c"
+			RelativePath="..\..\..\apps\directory\directory.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/email.dsc.vcproj b/platform/win32/vcproj/email.dsc.vcproj
similarity index 92%
rename from platform/win32/email.dsc.vcproj
rename to platform/win32/vcproj/email.dsc.vcproj
index acb037689..4ffddc24a 100644
--- a/platform/win32/email.dsc.vcproj
+++ b/platform/win32/vcproj/email.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\email\email-dsc.c"
+			RelativePath="..\..\..\apps\email\email-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/email.prg.vcproj b/platform/win32/vcproj/email.prg.vcproj
similarity index 83%
rename from platform/win32/email.prg.vcproj
rename to platform/win32/vcproj/email.prg.vcproj
index 03ce12d45..6dfeb8f88 100644
--- a/platform/win32/email.prg.vcproj
+++ b/platform/win32/vcproj/email.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -178,11 +178,11 @@
 			Name="lib"
 			>
 			<File
-				RelativePath="..\..\core\lib\ctk-textentry-multiline.c"
+				RelativePath="..\..\..\core\lib\ctk-textentry-multiline.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\lib\ctk-textentry-multiline.h"
+				RelativePath="..\..\..\core\lib\ctk-textentry-multiline.h"
 				>
 			</File>
 		</Filter>
@@ -190,32 +190,32 @@
 			Name="net"
 			>
 			<File
-				RelativePath="..\..\core\net\psock.c"
+				RelativePath="..\..\..\core\net\psock.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\net\psock.h"
+				RelativePath="..\..\..\core\net\psock.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\apps\email\email.c"
+			RelativePath="..\..\..\apps\email\email.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\email\smtp-socket.c"
+			RelativePath="..\..\..\apps\email\smtp-socket.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\email\smtp-strings.c"
+			RelativePath="..\..\..\apps\email\smtp-strings.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\email\smtp-strings.h"
+			RelativePath="..\..\..\apps\email\smtp-strings.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\email\smtp.h"
+			RelativePath="..\..\..\apps\email\smtp.h"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/ftp.dsc.vcproj b/platform/win32/vcproj/ftp.dsc.vcproj
similarity index 92%
rename from platform/win32/ftp.dsc.vcproj
rename to platform/win32/vcproj/ftp.dsc.vcproj
index 716bf60f2..f8997621b 100644
--- a/platform/win32/ftp.dsc.vcproj
+++ b/platform/win32/vcproj/ftp.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\ftp\ftp-dsc.c"
+			RelativePath="..\..\..\apps\ftp\ftp-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/ftp.prg.vcproj b/platform/win32/vcproj/ftp.prg.vcproj
similarity index 87%
rename from platform/win32/ftp.prg.vcproj
rename to platform/win32/vcproj/ftp.prg.vcproj
index ed398bc31..a39179fb5 100644
--- a/platform/win32/ftp.prg.vcproj
+++ b/platform/win32/vcproj/ftp.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -178,24 +178,24 @@
 			Name="lib"
 			>
 			<File
-				RelativePath="..\..\core\lib\memb.c"
+				RelativePath="..\..\..\core\lib\memb.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\lib\memb.h"
+				RelativePath="..\..\..\core\lib\memb.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\apps\ftp\ftp.c"
+			RelativePath="..\..\..\apps\ftp\ftp.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\ftp\ftpc.c"
+			RelativePath="..\..\..\apps\ftp\ftpc.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\ftp\ftpc.h"
+			RelativePath="..\..\..\apps\ftp\ftpc.h"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/irc.dsc.vcproj b/platform/win32/vcproj/irc.dsc.vcproj
similarity index 92%
rename from platform/win32/irc.dsc.vcproj
rename to platform/win32/vcproj/irc.dsc.vcproj
index c40302a86..3f84242d6 100644
--- a/platform/win32/irc.dsc.vcproj
+++ b/platform/win32/vcproj/irc.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\irc\irc-dsc.c"
+			RelativePath="..\..\..\apps\irc\irc-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/irc.prg.vcproj b/platform/win32/vcproj/irc.prg.vcproj
similarity index 83%
rename from platform/win32/irc.prg.vcproj
rename to platform/win32/vcproj/irc.prg.vcproj
index f049eff42..451570828 100644
--- a/platform/win32/irc.prg.vcproj
+++ b/platform/win32/vcproj/irc.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -178,11 +178,11 @@
 			Name="lib"
 			>
 			<File
-				RelativePath="..\..\core\lib\ctk-textentry-cmdline.c"
+				RelativePath="..\..\..\core\lib\ctk-textentry-cmdline.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\lib\ctk-textentry-cmdline.h"
+				RelativePath="..\..\..\core\lib\ctk-textentry-cmdline.h"
 				>
 			</File>
 		</Filter>
@@ -190,32 +190,32 @@
 			Name="net"
 			>
 			<File
-				RelativePath="..\..\core\net\psock.c"
+				RelativePath="..\..\..\core\net\psock.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\net\psock.h"
+				RelativePath="..\..\..\core\net\psock.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\apps\irc\irc.c"
+			RelativePath="..\..\..\apps\irc\irc.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\irc\ircc-strings.c"
+			RelativePath="..\..\..\apps\irc\ircc-strings.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\irc\ircc-strings.h"
+			RelativePath="..\..\..\apps\irc\ircc-strings.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\irc\ircc.c"
+			RelativePath="..\..\..\apps\irc\ircc.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\irc\ircc.h"
+			RelativePath="..\..\..\apps\irc\ircc.h"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/netconf.dsc.vcproj b/platform/win32/vcproj/netconf.dsc.vcproj
similarity index 91%
rename from platform/win32/netconf.dsc.vcproj
rename to platform/win32/vcproj/netconf.dsc.vcproj
index 61187d6c8..43911b39e 100644
--- a/platform/win32/netconf.dsc.vcproj
+++ b/platform/win32/vcproj/netconf.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\netconf\netconf-dsc.c"
+			RelativePath="..\..\..\apps\netconf\netconf-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/netconf.prg.vcproj b/platform/win32/vcproj/netconf.prg.vcproj
similarity index 91%
rename from platform/win32/netconf.prg.vcproj
rename to platform/win32/vcproj/netconf.prg.vcproj
index af7a5db4c..5e8079ac5 100644
--- a/platform/win32/netconf.prg.vcproj
+++ b/platform/win32/vcproj/netconf.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -175,7 +175,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\netconf\netconf.c"
+			RelativePath="..\..\..\apps\netconf\netconf.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/processes.dsc.vcproj b/platform/win32/vcproj/processes.dsc.vcproj
similarity index 91%
rename from platform/win32/processes.dsc.vcproj
rename to platform/win32/vcproj/processes.dsc.vcproj
index 0037094ad..a583be5c3 100644
--- a/platform/win32/processes.dsc.vcproj
+++ b/platform/win32/vcproj/processes.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\process-list\process-list-dsc.c"
+			RelativePath="..\..\..\apps\process-list\process-list-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/processes.prg.vcproj b/platform/win32/vcproj/processes.prg.vcproj
similarity index 90%
rename from platform/win32/processes.prg.vcproj
rename to platform/win32/vcproj/processes.prg.vcproj
index c09ebc5b6..87b4d5154 100644
--- a/platform/win32/processes.prg.vcproj
+++ b/platform/win32/vcproj/processes.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -175,7 +175,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\process-list\process-list.c"
+			RelativePath="..\..\..\apps\process-list\process-list.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/shell.dsc.vcproj b/platform/win32/vcproj/shell.dsc.vcproj
similarity index 92%
rename from platform/win32/shell.dsc.vcproj
rename to platform/win32/vcproj/shell.dsc.vcproj
index a7c5c4016..9edfcca2e 100644
--- a/platform/win32/shell.dsc.vcproj
+++ b/platform/win32/vcproj/shell.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\shell\shell-dsc.c"
+			RelativePath="..\..\..\apps\shell\shell-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/shell.prg.vcproj b/platform/win32/vcproj/shell.prg.vcproj
similarity index 86%
rename from platform/win32/shell.prg.vcproj
rename to platform/win32/vcproj/shell.prg.vcproj
index 5d21d5bd0..dcb4d698b 100644
--- a/platform/win32/shell.prg.vcproj
+++ b/platform/win32/vcproj/shell.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -178,24 +178,24 @@
 			Name="lib"
 			>
 			<File
-				RelativePath="..\..\core\lib\ctk-textentry-cmdline.c"
+				RelativePath="..\..\..\core\lib\ctk-textentry-cmdline.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\lib\ctk-textentry-cmdline.h"
+				RelativePath="..\..\..\core\lib\ctk-textentry-cmdline.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\apps\shell\shell-gui.c"
+			RelativePath="..\..\..\apps\shell\shell-gui.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\shell\shell.c"
+			RelativePath="..\..\..\apps\shell\shell.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\shell\shell.h"
+			RelativePath="..\..\..\apps\shell\shell.h"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/telnet.dsc.vcproj b/platform/win32/vcproj/telnet.dsc.vcproj
similarity index 92%
rename from platform/win32/telnet.dsc.vcproj
rename to platform/win32/vcproj/telnet.dsc.vcproj
index b4653f730..226e2fb95 100644
--- a/platform/win32/telnet.dsc.vcproj
+++ b/platform/win32/vcproj/telnet.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\telnet\telnet-dsc.c"
+			RelativePath="..\..\..\apps\telnet\telnet-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/telnet.prg.vcproj b/platform/win32/vcproj/telnet.prg.vcproj
similarity index 87%
rename from platform/win32/telnet.prg.vcproj
rename to platform/win32/vcproj/telnet.prg.vcproj
index f5bfe2d53..d1d2c7f00 100644
--- a/platform/win32/telnet.prg.vcproj
+++ b/platform/win32/vcproj/telnet.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -175,19 +175,19 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\telnet\simpletelnet.c"
+			RelativePath="..\..\..\apps\telnet\simpletelnet.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\telnet\simpletelnet.h"
+			RelativePath="..\..\..\apps\telnet\simpletelnet.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\telnet\telnet.c"
+			RelativePath="..\..\..\apps\telnet\telnet.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\telnet\telnet.h"
+			RelativePath="..\..\..\apps\telnet\telnet.h"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/webserver.dsc.vcproj b/platform/win32/vcproj/webserver.dsc.vcproj
similarity index 91%
rename from platform/win32/webserver.dsc.vcproj
rename to platform/win32/vcproj/webserver.dsc.vcproj
index 9217daed3..7ff2d2d0b 100644
--- a/platform/win32/webserver.dsc.vcproj
+++ b/platform/win32/vcproj/webserver.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\webserver\webserver-dsc.c"
+			RelativePath="..\..\..\apps\webserver\webserver-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/webserver.prg.vcproj b/platform/win32/vcproj/webserver.prg.vcproj
similarity index 79%
rename from platform/win32/webserver.prg.vcproj
rename to platform/win32/vcproj/webserver.prg.vcproj
index f97efc31b..4fa4c3909 100644
--- a/platform/win32/webserver.prg.vcproj
+++ b/platform/win32/vcproj/webserver.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -178,11 +178,11 @@
 			Name="net"
 			>
 			<File
-				RelativePath="..\..\core\net\psock.c"
+				RelativePath="..\..\..\core\net\psock.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\net\psock.h"
+				RelativePath="..\..\..\core\net\psock.h"
 				>
 			</File>
 		</Filter>
@@ -190,52 +190,52 @@
 			Name="lib"
 			>
 			<File
-				RelativePath="..\..\core\lib\memb.c"
+				RelativePath="..\..\..\core\lib\memb.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\lib\memb.h"
+				RelativePath="..\..\..\core\lib\memb.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\apps\webserver\http-strings.c"
+			RelativePath="..\..\..\apps\webserver\http-strings.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webserver\http-strings.h"
+			RelativePath="..\..\..\apps\webserver\http-strings.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webserver\httpd-cgi.c"
+			RelativePath="..\..\..\apps\webserver\httpd-cgi.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webserver\httpd-cgi.h"
+			RelativePath="..\..\..\apps\webserver\httpd-cgi.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webserver\httpd-fs.c"
+			RelativePath="..\..\..\apps\webserver\httpd-fs.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webserver\httpd-fs.h"
+			RelativePath="..\..\..\apps\webserver\httpd-fs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webserver\httpd.c"
+			RelativePath="..\..\..\apps\webserver\httpd.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webserver\httpd.h"
+			RelativePath="..\..\..\apps\webserver\httpd.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webserver\webserver.c"
+			RelativePath="..\..\..\apps\webserver\webserver.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webserver\webserver.h"
+			RelativePath="..\..\..\apps\webserver\webserver.h"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/wpcap.drv.vcproj b/platform/win32/vcproj/wpcap.drv.vcproj
similarity index 88%
rename from platform/win32/wpcap.drv.vcproj
rename to platform/win32/vcproj/wpcap.drv.vcproj
index 332f56c92..b80b04e39 100644
--- a/platform/win32/wpcap.drv.vcproj
+++ b/platform/win32/vcproj/wpcap.drv.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -178,20 +178,20 @@
 			Name="net"
 			>
 			<File
-				RelativePath="..\..\core\net\uip_arp.c"
+				RelativePath="..\..\..\core\net\uip_arp.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\net\uip_arp.h"
+				RelativePath="..\..\..\core\net\uip_arp.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath=".\net\wpcap-service.c"
+			RelativePath="..\net\wpcap-service.c"
 			>
 		</File>
 		<File
-			RelativePath=".\net\wpcap-service.h"
+			RelativePath="..\net\wpcap-service.h"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/wpcap.dsc.vcproj b/platform/win32/vcproj/wpcap.dsc.vcproj
similarity index 92%
rename from platform/win32/wpcap.dsc.vcproj
rename to platform/win32/vcproj/wpcap.dsc.vcproj
index 87a9cf668..842fa0c2b 100644
--- a/platform/win32/wpcap.dsc.vcproj
+++ b/platform/win32/vcproj/wpcap.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath=".\net\wpcap-dsc.c"
+			RelativePath="..\net\wpcap-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/www.dsc.vcproj b/platform/win32/vcproj/www.dsc.vcproj
similarity index 91%
rename from platform/win32/www.dsc.vcproj
rename to platform/win32/vcproj/www.dsc.vcproj
index 7ef40d46e..0ab3324e9 100644
--- a/platform/win32/www.dsc.vcproj
+++ b/platform/win32/vcproj/www.dsc.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -93,7 +93,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core"
+				AdditionalIncludeDirectories="..;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -171,7 +171,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\apps\webbrowser\www-dsc.c"
+			RelativePath="..\..\..\apps\webbrowser\www-dsc.c"
 			>
 		</File>
 	</Files>
diff --git a/platform/win32/www.prg.vcproj b/platform/win32/vcproj/www.prg.vcproj
similarity index 78%
rename from platform/win32/www.prg.vcproj
rename to platform/win32/vcproj/www.prg.vcproj
index b51ae2f0a..ee14c476a 100644
--- a/platform/win32/www.prg.vcproj
+++ b/platform/win32/vcproj/www.prg.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -95,7 +95,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;../../core;../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -178,60 +178,60 @@
 			Name="sys"
 			>
 			<File
-				RelativePath="..\..\core\sys\arg.c"
+				RelativePath="..\..\..\core\sys\arg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\core\sys\arg.h"
+				RelativePath="..\..\..\core\sys\arg.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\apps\webbrowser\html-strings.c"
+			RelativePath="..\..\..\apps\webbrowser\html-strings.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\html-strings.h"
+			RelativePath="..\..\..\apps\webbrowser\html-strings.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\htmlparser.c"
+			RelativePath="..\..\..\apps\webbrowser\htmlparser.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\htmlparser.h"
+			RelativePath="..\..\..\apps\webbrowser\htmlparser.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\http-strings.c"
+			RelativePath="..\..\..\apps\webbrowser\http-strings.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\http-strings.h"
+			RelativePath="..\..\..\apps\webbrowser\http-strings.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\http-user-agent-string.c"
+			RelativePath="..\..\..\apps\webbrowser\http-user-agent-string.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\http-user-agent-string.h"
+			RelativePath="..\..\..\apps\webbrowser\http-user-agent-string.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\webclient.c"
+			RelativePath="..\..\..\apps\webbrowser\webclient.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\webclient.h"
+			RelativePath="..\..\..\apps\webbrowser\webclient.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\www.c"
+			RelativePath="..\..\..\apps\webbrowser\www.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\apps\webbrowser\www.h"
+			RelativePath="..\..\..\apps\webbrowser\www.h"
 			>
 		</File>
 	</Files>