diff --git a/src/Spring/Spring.Services/App.config b/src/Spring/Spring.Services/App.config
deleted file mode 100644
index f93d71ae..00000000
--- a/src/Spring/Spring.Services/App.config
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--@ <code> @-->
-<configuration>
-
-	<configSections>
-		<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
-		<sectionGroup name="spring">
-			<section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core" />
-			<section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" />
-		</sectionGroup>
-	</configSections>
-	  
-	<spring>
-		<context type="Spring.Context.Support.XmlApplicationContext, Spring.Core">
-			<resource uri="file://~/service-process-definition.xml" />
-		</context>		
-	</spring>
-
-	<system.runtime.remoting>
-	<application>
-		<channels>
-		<channel ref="http" port="1234" />		
-		</channels>
-	</application>
-	</system.runtime.remoting>
- 
-  <log4net>
-    <!-- see http://logging.apache.org/log4net/release/manual/introduction.html -->
-    <appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%d [%t] %-5p %c{1} - %m%n" />
-      </layout>
-      <file value="logs/Spring.Service.Process.log" />
-      <appendToFile value="true" />
-      <maximumFileSize value="500KB" />
-      <maxSizeRollBackups value="5" />
-    </appender>
-    <appender name="OutputDebugString" type="log4net.Appender.OutputDebugStringAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%d{HH:mm:ss,fff} %-5p %c{2}(line:%L) - %m%n" />
-      </layout>
-    </appender>
-    <root>
-      <level value="OFF" />
-    </root>
-	  <logger name="Spring.Services">
-		  <level value="ALL" />
-      <appender-ref ref="RollingFile" />
-      <appender-ref ref="OutputDebugString" />
-	  </logger>	  
-  </log4net>
-
-</configuration>
-<!--@ </code> @-->
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.2005.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.2005.csproj
deleted file mode 100644
index 17f37da2..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.2005.csproj
+++ /dev/null
@@ -1,263 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B8381347-51A1-4850-828C-3170FA93846C}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Services.WindowsService.Common</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring.Services</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Common\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>Spring.Services.WindowsService.Common.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Common\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>Spring.Services.WindowsService.Common.xml</DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="cscompmgd">
-      <Name>cscompmgd</Name>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.DirectoryServices">
-      <Name>System.DirectoryServices</Name>
-    </Reference>
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.Runtime.Remoting">
-      <Name>System.Runtime.Remoting</Name>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization.Formatters.Soap">
-      <Name>System.Runtime.Serialization.Formatters.Soap</Name>
-    </Reference>
-    <Reference Include="System.Web">
-      <Name>System.Web</Name>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <Name>System.Windows.Forms</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Services.WindowsService.Common.build" />
-    <Compile Include="WindowsService\Common\Application.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\ApplicationHost.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\DefaultService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\AggregatedDeployEventDispatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\ApplicationWatcherManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\DefaultApplicationWatcherFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\DefaultDeployer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\DeployEventAggregator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\DeployEventArgs.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\DeployManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\DeployStatus.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\FileSystem\FileSystemApplicationWatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\FileSystem\FileSystemDeployLocation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\FileSystem\FileSystemMonitor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\FileSystem\IFileSystemEventFilter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\FileSystem\RegularExpressionFilter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\FileSystem\RegularExpressionFilterConfigurer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\ForwardingDeployEventDispatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\IApplicationHostManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\IApplicationWatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\IApplicationWatcherConfigurer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\IApplicationWatcherFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\IDeployer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\IDeployEventDispatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\IDeployEventSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\IDeployLocation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\NullApplicationWatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\NullWatcherConfigurer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\SeparateAppDomainHostManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Deploy\SpringAssembliesDeployer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\DisposableSupport.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Gui\ApplicationMonitor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Gui\CursorChanger.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\IApplication.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\IApplicationHost.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\IServiceSupport.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\ITrigger.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Localizer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\ServiceSupport.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\SpringService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\ThreadingTimerTrigger.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Common\Utils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="WindowsService\Common\Gui\ApplicationMonitor.resx">
-      <DependentUpon>ApplicationMonitor.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\sandbox\src\Spring\Spring.Threading\Spring.Threading.2005.csproj">
-      <Project>{4640D873-95DC-4130-98E2-2B931D390C20}</Project>
-      <Name>Spring.Threading.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.build b/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.build
deleted file mode 100644
index b7864879..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.build
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<project name="Spring.Services.WindowsService.Common" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-   <target name="build">
-    <csc target="library" define="${current.build.defines.csc}" 
-         warnaserror="false"
-         debug="${current.build.debug}" 
-         output="${current.bin.dir}/${project::get-name()}.dll" 
-         doc="${current.bin.dir}/${project::get-name()}.xml">
-      <arg line="${compiler.args}"/>
-      <nowarn>
-        <warning number="${nowarn.numbers}" />
-      </nowarn>
-      <sources failonempty="true">
-        <include name="WindowsService/Common/**/*.cs" />
-        <include name="../CommonAssemblyInfo.cs" />
-      </sources>
-      <references basedir="${current.bin.dir}">
-        <include name="*.dll"/>
-        <exclude name="${project::get-name()}.dll"/>
-      </references>
-    </csc>
-   </target>
-    
-</project>
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.csproj
deleted file mode 100644
index 8bb7fa39..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.csproj
+++ /dev/null
@@ -1,359 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{B8381347-51A1-4850-828C-3170FA93846C}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "Spring.Services.WindowsService.Common"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "Spring.Services"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = "Spring.Services.WindowsService.Common.xml"
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Common\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = "Spring.Services.WindowsService.Common.xml"
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Common\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-                <Reference
-                    Name = "System.Windows.Forms"
-                    AssemblyName = "System.Windows.Forms"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
-                />
-                <Reference
-                    Name = "System.Drawing"
-                    AssemblyName = "System.Drawing"
-                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
-                />
-                <Reference
-                    Name = "System.Runtime.Remoting"
-                    AssemblyName = "System.Runtime.Remoting"
-                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Remoting.dll"
-                />
-                <Reference
-                    Name = "System.Web"
-                    AssemblyName = "System.Web"
-                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
-                />
-                <Reference
-                    Name = "System.Runtime.Serialization.Formatters.Soap"
-                    AssemblyName = "System.Runtime.Serialization.Formatters.Soap"
-                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Serialization.Formatters.Soap.dll"
-                />
-                <Reference
-                    Name = "System.DirectoryServices"
-                    AssemblyName = "System.DirectoryServices"
-                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.DirectoryServices.dll"
-                />
-                <Reference
-                    Name = "cscompmgd"
-                    AssemblyName = "cscompmgd"
-                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\cscompmgd.dll"
-                />
-                <Reference
-                    Name = "Spring.Threading"
-                    Project = "{4640D873-95DC-4130-98E2-2B931D390C20}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "Spring.Core.2003"
-                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "Common.Logging"
-                    AssemblyName = "Common.Logging"
-                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "Spring.Services.WindowsService.Common.build"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Application.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\ApplicationHost.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\DefaultService.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\DisposableSupport.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\IApplication.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\IApplicationHost.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\IServiceSupport.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\ITrigger.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Localizer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\ServiceSupport.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\SpringService.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\ThreadingTimerTrigger.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Utils.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\AggregatedDeployEventDispatcher.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\ApplicationWatcherManager.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\DefaultApplicationWatcherFactory.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\DefaultDeployer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\DeployEventAggregator.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\DeployEventArgs.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\DeployManager.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\DeployStatus.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\ForwardingDeployEventDispatcher.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\IApplicationHostManager.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\IApplicationWatcher.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\IApplicationWatcherConfigurer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\IApplicationWatcherFactory.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\IDeployer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\IDeployEventDispatcher.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\IDeployEventSource.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\IDeployLocation.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\NullApplicationWatcher.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\NullWatcherConfigurer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\SeparateAppDomainHostManager.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\SpringAssembliesDeployer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\FileSystem\FileSystemApplicationWatcher.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\FileSystem\FileSystemDeployLocation.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\FileSystem\FileSystemMonitor.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\FileSystem\IFileSystemEventFilter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\FileSystem\RegularExpressionFilter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Deploy\FileSystem\RegularExpressionFilterConfigurer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Gui\ApplicationMonitor.cs"
-                    SubType = "UserControl"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Gui\ApplicationMonitor.resx"
-                    DependentUpon = "ApplicationMonitor.cs"
-                    BuildAction = "EmbeddedResource"
-                />
-                <File
-                    RelPath = "WindowsService\Common\Gui\CursorChanger.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.build b/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.build
deleted file mode 100644
index e50f9ce8..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.build
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<project name="Spring.Services.WindowsService.Gui" default="build">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-   <target name="build">
-      <csc target="winexe" define="${current.build.defines.csc}" 
-  	   warnaserror="false" 
-           nowarn="${nowarn.numbers}" 
-	   debug="${current.build.debug}" 
-           win32icon="../../../icons/spring.ico"
-	   output="${current.bin.dir}/${project::get-name()}.exe">
-		<!-- doc="${build.dir}/bin/${project::get-name()}.xml" -->
- 	 <arg line="${compiler.args}"/>
-         <sources failonempty="true">
-            <include name="WindowsService/Gui/**/*.cs" />
-            <include name="../CommonAssemblyInfo.cs" />
-         </sources>
-         <references basedir="${current.bin.dir}">
-            <include name="*.dll"/>
-            <exclude name="${project::get-name()}.dll"/>
-         </references>
-         <resources>
-            <include name="WindowsService/Gui/**/*.resx"/>
-         </resources>
-      </csc>
-   </target>
-    
-</project>
-
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.csproj
deleted file mode 100644
index 901aa215..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.csproj
+++ /dev/null
@@ -1,164 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{B6EC8215-FE1F-4178-9B92-4B9921DA0A5C}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = "..\..\..\icons\spring32-16.ico"
-                AssemblyKeyContainerName = ""
-                AssemblyName = "Spring.Services.WindowsService.Gui"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "WinExe"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "Spring.Services"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = "Spring.Services.WindowsService.Gui.Program"
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Gui\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Gui\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-                <Reference
-                    Name = "System.Drawing"
-                    AssemblyName = "System.Drawing"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
-                />
-                <Reference
-                    Name = "System.Windows.Forms"
-                    AssemblyName = "System.Windows.Forms"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
-                />
-                <Reference
-                    Name = "System.ServiceProcess"
-                    AssemblyName = "System.ServiceProcess"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.ServiceProcess.dll"
-                />
-                <Reference
-                    Name = "Spring.Services.WindowsService.Common"
-                    Project = "{B8381347-51A1-4850-828C-3170FA93846C}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "System.Runtime.Remoting"
-                    AssemblyName = "System.Runtime.Remoting"
-                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Remoting.dll"
-                />
-                <Reference
-                    Name = "Spring.Core"
-                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "Spring.Threading"
-                    Project = "{4640D873-95DC-4130-98E2-2B931D390C20}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "Spring.Services.WindowsService.Gui.build"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "WindowsService\Gui\ConfigurationForm.cs"
-                    SubType = "Form"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Gui\ConfigurationForm.resx"
-                    DependentUpon = "ConfigurationForm.cs"
-                    BuildAction = "EmbeddedResource"
-                />
-                <File
-                    RelPath = "WindowsService\Gui\Controller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Gui\Manager.cs"
-                    SubType = "Form"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Gui\Manager.resx"
-                    DependentUpon = "Manager.cs"
-                    BuildAction = "EmbeddedResource"
-                />
-                <File
-                    RelPath = "WindowsService\Gui\TrayMonitor.cs"
-                    SubType = "Form"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Gui\TrayMonitor.resx"
-                    DependentUpon = "TrayMonitor.cs"
-                    BuildAction = "EmbeddedResource"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.2005.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.2005.csproj
deleted file mode 100644
index 791324de..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.2005.csproj
+++ /dev/null
@@ -1,119 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{832EB570-71D3-4847-92CA-56E8225576D7}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>..\..\..\icons\spring32-16.ico</ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Services.WindowsService.Installer</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Spring.Services</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>Spring.Services.WindowsService.Installer.ServiceInstaller</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Installer\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>Spring.Services.WindowsService.Installer.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Installer\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Configuration.Install">
-      <Name>System.Configuration.Install</Name>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Runtime.Remoting">
-      <Name>System.Runtime.Remoting</Name>
-    </Reference>
-    <Reference Include="System.ServiceProcess">
-      <Name>System.ServiceProcess</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Services.WindowsService.Installer.build" />
-    <Compile Include="WindowsService\Installer\SvcInstaller.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="Spring.Services.WindowsService.Common.2005.csproj">
-      <Project>{B8381347-51A1-4850-828C-3170FA93846C}</Project>
-      <Name>Spring.Services.WindowsService.Common.2005</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>copy "$(ProjectDir)WindowsService\Process\service-process-definition.xml" "$(TargetDir)"</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.build b/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.build
deleted file mode 100644
index beaa1fab..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.build
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<project name="Spring.Services.WindowsService.Installer" default="build">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-
-   <target name="build">
-        <csc target="exe" define="${current.build.defines.csc}" 
-             warnaserror="false"
-             debug="${current.build.debug}" 
-             win32icon="../../../icons/spring.ico"
-             output="${current.bin.dir}/${project::get-name()}.exe" 
-             doc="${current.bin.dir}/${project::get-name()}.xml">
-	<arg line="${compiler.args}"/>
-        <nowarn>
-          <warning number="${nowarn.numbers}" />
-        </nowarn>
-         <sources failonempty="true">
-            <include name="WindowsService/Installer/**/*.cs" />
-            <include name="../CommonAssemblyInfo.cs" />
-         </sources>
-         <references basedir="${current.bin.dir}">
-            <include name="*.dll"/>
-            <exclude name="${project::get-name()}.dll"/>
-         </references>
-        </csc>
-   </target>
-    
-</project>
-
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.csproj
deleted file mode 100644
index be617a8c..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.csproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{36790A24-6817-4A43-AFF6-FA9E0FDEC8D3}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = "..\..\..\icons\spring32-16.ico"
-                AssemblyKeyContainerName = ""
-                AssemblyName = "Spring.Services.WindowsService.Installer"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Exe"
-                PreBuildEvent = ""
-                PostBuildEvent = 'copy "$(ProjectDir)WindowsService\Process\service-process-definition.xml" "$(TargetDir)"'
-                RootNamespace = "Spring.Services"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = "Spring.Services.WindowsService.Installer.ServiceInstaller"
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = "Spring.Services.WindowsService.Installer.xml"
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Installer\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Installer\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.ServiceProcess"
-                    AssemblyName = "System.ServiceProcess"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.ServiceProcess.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-                <Reference
-                    Name = "System.Configuration.Install"
-                    AssemblyName = "System.Configuration.Install"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Configuration.Install.dll"
-                />
-                <Reference
-                    Name = "Spring.Services.WindowsService.Common"
-                    Project = "{B8381347-51A1-4850-828C-3170FA93846C}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "System.Runtime.Remoting"
-                    AssemblyName = "System.Runtime.Remoting"
-                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Remoting.dll"
-                />
-                <Reference
-                    Name = "Spring.Core.2003"
-                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "Common.Logging"
-                    AssemblyName = "Common.Logging"
-                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "Spring.Services.WindowsService.Installer.build"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "WindowsService\Installer\SvcInstaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.2005.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.2005.csproj
deleted file mode 100644
index 5e323f5d..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.2005.csproj
+++ /dev/null
@@ -1,140 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{36790A24-6817-4A43-AFF6-FA9E0FDEC8D3}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>..\..\..\icons\spring32-16.ico</ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Services.WindowsService.Process</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>Spring.Services</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Process\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>Spring.Services.WindowsService.Process.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Process\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Configuration.Install">
-      <Name>System.Configuration.Install</Name>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Runtime.Remoting">
-      <Name>System.Runtime.Remoting</Name>
-    </Reference>
-    <Reference Include="System.ServiceProcess">
-      <Name>System.ServiceProcess</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="Spring.Services.WindowsService.Process.build" />
-    <None Include="WindowsService\Process\service-process-definition.xml" />
-    <Content Include="WindowsService\Process\App.ico" />
-    <Compile Include="WindowsService\Process\Service.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WindowsService\Process\ServiceInstaller.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <EmbeddedResource Include="WindowsService\Process\Service.resx">
-      <DependentUpon>Service.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="WindowsService\Process\ServiceInstaller.resx">
-      <DependentUpon>ServiceInstaller.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\sandbox\src\Spring\Spring.Threading\Spring.Threading.2005.csproj">
-      <Project>{4640D873-95DC-4130-98E2-2B931D390C20}</Project>
-      <Name>Spring.Threading.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="Spring.Services.2005.csproj">
-      <Project>{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}</Project>
-      <Name>Spring.Services.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="Spring.Services.WindowsService.Common.2005.csproj">
-      <Project>{B8381347-51A1-4850-828C-3170FA93846C}</Project>
-      <Name>Spring.Services.WindowsService.Common.2005</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>copy "$(ProjectDir)WindowsService\Process\service-process-definition.xml" "$(TargetDir)"</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.build b/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.build
deleted file mode 100644
index e5a11f4d..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.build
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<project name="Spring.Services.WindowsService.Process" default="build">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-   <target name="build">
-        <csc target="exe" define="${current.build.defines.csc}" 
-             warnaserror="false"
-             debug="${current.build.debug}" 
-             win32icon="../../../icons/spring.ico"
-             output="${current.bin.dir}/${project::get-name()}.exe" 
-             doc="${current.bin.dir}/${project::get-name()}.xml">
-	<arg line="${compiler.args}"/>
-        <nowarn>
-          <warning number="${nowarn.numbers}" />
-        </nowarn>
-         <sources failonempty="true">
-            <include name="WindowsService/Process/**/*.cs" />
-            <include name="../CommonAssemblyInfo.cs" />
-         </sources>
-         <references basedir="${current.bin.dir}">
-            <include name="*.dll"/>
-            <exclude name="${project::get-name()}.dll"/>
-         </references>
-        </csc>
-        <copy todir="${current.bin.dir}" overwrite="true">
-          <fileset basedir="WindowsService/Process">
-            <include name="service-process-definition.xml"/>
-          </fileset>
-        </copy>
-        <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
-            file="App.config" overwrite="true">
-        </copy>
-   </target>
-    
-</project>
-
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.csproj
deleted file mode 100644
index 836014b7..00000000
--- a/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.csproj
+++ /dev/null
@@ -1,166 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{36790A24-6817-4A43-AFF6-FA9E0FDEC8D3}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = "..\..\..\icons\spring32-16.ico"
-                AssemblyKeyContainerName = ""
-                AssemblyName = "Spring.Services.WindowsService.Process"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "WinExe"
-                PreBuildEvent = ""
-                PostBuildEvent = 'copy "$(ProjectDir)WindowsService\Process\service-process-definition.xml" "$(TargetDir)"'
-                RootNamespace = "Spring.Services"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = "Spring.Services.WindowsService.Process.xml"
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Process\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Process\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.ServiceProcess"
-                    AssemblyName = "System.ServiceProcess"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.ServiceProcess.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-                <Reference
-                    Name = "System.Configuration.Install"
-                    AssemblyName = "System.Configuration.Install"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Configuration.Install.dll"
-                />
-                <Reference
-                    Name = "Spring.Services.WindowsService.Common"
-                    Project = "{B8381347-51A1-4850-828C-3170FA93846C}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "System.Runtime.Remoting"
-                    AssemblyName = "System.Runtime.Remoting"
-                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Remoting.dll"
-                />
-                <Reference
-                    Name = "Spring.Threading"
-                    Project = "{4640D873-95DC-4130-98E2-2B931D390C20}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "Spring.Core.2003"
-                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "Spring.Services.2003"
-                    Project = "{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "Common.Logging"
-                    AssemblyName = "Common.Logging"
-                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "App.config"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "Spring.Services.WindowsService.Process.build"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "WindowsService\Process\App.ico"
-                    BuildAction = "Content"
-                />
-                <File
-                    RelPath = "WindowsService\Process\Service.cs"
-                    SubType = "Component"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Process\Service.resx"
-                    DependentUpon = "Service.cs"
-                    BuildAction = "EmbeddedResource"
-                />
-                <File
-                    RelPath = "WindowsService\Process\ServiceInstaller.cs"
-                    SubType = "Component"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "WindowsService\Process\ServiceInstaller.resx"
-                    DependentUpon = "ServiceInstaller.cs"
-                    BuildAction = "EmbeddedResource"
-                />
-                <File
-                    RelPath = "WindowsService\Process\service-process-definition.xml"
-                    BuildAction = "None"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-