diff --git a/build/ContinuousIntegration/TeamCity/apply-t4-templates.bat b/build/ContinuousIntegration/TeamCity/apply-t4-templates.bat
deleted file mode 100644
index 70012d10..00000000
--- a/build/ContinuousIntegration/TeamCity/apply-t4-templates.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-IF DEFINED CommonProgramFiles(x86) GOTO x64
-
-:x86
-SET common=%CommonProgramFiles%
-GOTO prepare
-
-:x64
-SET common=%CommonProgramFiles(x86)%
-GOTO prepare
-
-:prepare
-"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\..\src\Numerics\Version.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\..\src\Numerics\Version.tt
-"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\..\src\Silverlight\Version.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\..\src\Silverlight\Version.tt
-
-"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\..\src\Numerics\Algorithms\LinearAlgebra\Atlas\AtlasLinearAlgebraProvider.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\..\src\Numerics\Algorithms\LinearAlgebra\Atlas\AtlasLinearAlgebraProvider.tt
-"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\..\src\Numerics\Algorithms\LinearAlgebra\Atlas\SafeNativeMethods.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\..\src\Numerics\Algorithms\LinearAlgebra\Atlas\SafeNativeMethods.tt
-"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\MklLinearAlgebraProvider.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\MklLinearAlgebraProvider.tt
-"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\SafeNativeMethods.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\SafeNativeMethods.tt
-
-set common= 
\ No newline at end of file
diff --git a/build/ContinuousIntegration/TeamCity/codequality.proj b/build/ContinuousIntegration/TeamCity/codequality.proj
deleted file mode 100644
index a0e6962e..00000000
--- a/build/ContinuousIntegration/TeamCity/codequality.proj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="CheckStyle" ToolsVersion="4.0">
-  <UsingTask TaskName="MSBuild.ExtensionPack.CodeQuality.StyleCop" AssemblyFile="..\..\MSBuild_Extension_Pack_3.5.5\StyleCop\MSBuild.ExtensionPack.StyleCop.dll" />
-  
-  <Target Name="CheckStyle" DependsOnTargets="StyleCop; Gendarme"/>
-  
-  <Target Name="StyleCop">
-    <CreateItem Include="../../../src/Numerics/**/*.cs">
-      <Output TaskParameter="Include" ItemName="StyleCopFiles" />
-    </CreateItem>
-
-    <MSBuild.ExtensionPack.CodeQuality.StyleCop TaskAction="Scan" SettingsFile="../../../src/Settings.StyleCop" SourceFiles="@(StyleCopFiles)" ShowOutput="true" ForceFullAnalysis="true" CacheResults="false" ContinueOnError="false">
-      <Output TaskParameter="Succeeded" PropertyName="AllPassed" />
-      <Output TaskParameter="ViolationCount" PropertyName="Violations" />
-      <Output TaskParameter="FailedFiles" ItemName="Failures" />
-    </MSBuild.ExtensionPack.CodeQuality.StyleCop>
-    <Message Text="StyleCop Succeeded: $(AllPassed), Violations: $(Violations)" />
-    <Warning Text="%(Failures.Identity) - Failed on Line %(Failures.LineNumber). %(Failures.CheckId): %(Failures.Message)" />
-  </Target>
-  
-  <Target Name="Gendarme">
-    <Exec Command="$(MSBuildProjectDirectory)\..\..\..\tools\Gendarme-2.4\gendarme.exe $(MSBuildProjectDirectory)\..\..\..\src\Numerics\bin\Debug\MathNet.Numerics.dll"/>
-  </Target>
-  
-</Project>
\ No newline at end of file
diff --git a/build/ContinuousIntegration/TeamCity/unittests.proj b/build/ContinuousIntegration/TeamCity/unittests.proj
deleted file mode 100644
index cf06d377..00000000
--- a/build/ContinuousIntegration/TeamCity/unittests.proj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Test" ToolsVersion="4.0">
-  <UsingTask TaskName="Gallio.MSBuildTasks.Gallio" AssemblyFile="..\..\..\lib\Gallio_3.2.517.0\Gallio.MSBuildTasks.dll" />
-  
-  <PropertyGroup>
-    <Config Condition="'$(Config)' == ''">Debug</Config>
-    <Optimize Condition="'$(Optimize)' == ''">False</Optimize>
-  </PropertyGroup>
-  
-  <Target Name="Compile">
-    <MSBuild Projects="../../../src/UnitTests/UnitTests.csproj" Properties="Configuration=$(Config);Optimize=$(Optimize);OutputPath=$(MSBuildProjectDirectory)/bin" />
-    <MSBuild Projects="../../../src/FSharpUnitTests/FSharpUnitTests.fsproj" Properties="Configuration=$(Config);Optimize=$(Optimize);OutputPath=$(MSBuildProjectDirectory)/bin" />
-  </Target>
-  
-  <Target Name="Test" DependsOnTargets="Compile">
-    <Gallio.MSBuildTasks.Gallio ContinueOnError="False" IgnoreFailures="False" Files="./bin/MathNet.Numerics.UnitTests.dll" />
-    <Exec Command="$(MSBuildProjectDirectory)/bin/FSharpUnitTests.exe" IgnoreExitCode="false" />
-  </Target>
-  
-</Project>
\ No newline at end of file
diff --git a/build/TeamCity/apply-t4-templates.bat b/build/TeamCity/apply-t4-templates.bat
new file mode 100644
index 00000000..acb66005
--- /dev/null
+++ b/build/TeamCity/apply-t4-templates.bat
@@ -0,0 +1,22 @@
+IF DEFINED CommonProgramFiles(x86) GOTO x64
+
+:x86
+SET common=%CommonProgramFiles%
+GOTO prepare
+
+:x64
+SET common=%CommonProgramFiles(x86)%
+GOTO prepare
+
+:prepare
+"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\src\Numerics\Version.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\src\Numerics\Version.tt
+"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\src\Silverlight\Version.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\src\Silverlight\Version.tt
+
+"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\MklLinearAlgebraProvider.Complex.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\MklLinearAlgebraProvider.Complex.tt
+"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\MklLinearAlgebraProvider.Complex32.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\MklLinearAlgebraProvider.Complex32.tt
+"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\MklLinearAlgebraProvider.double.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\MklLinearAlgebraProvider.double.tt
+"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\MklLinearAlgebraProvider.float.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\MklLinearAlgebraProvider.float.tt
+"%common%\Microsoft Shared\TextTemplating\10.0\texttransform.exe" -out ..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\SafeNativeMethods.cs -P "%ProgramFiles%\Reference Assemblies\Microsoft\Framework\v3.5" ..\..\src\Numerics\Algorithms\LinearAlgebra\Mkl\SafeNativeMethods.tt
+
+
+set common= 
\ No newline at end of file
diff --git a/build/ContinuousIntegration/TeamCity/bootstrap.proj b/build/TeamCity/bootstrap.proj
similarity index 100%
rename from build/ContinuousIntegration/TeamCity/bootstrap.proj
rename to build/TeamCity/bootstrap.proj
diff --git a/build/ContinuousIntegration/TeamCity/on-checkin.proj b/build/TeamCity/on-checkin.proj
similarity index 58%
rename from build/ContinuousIntegration/TeamCity/on-checkin.proj
rename to build/TeamCity/on-checkin.proj
index 3877ed90..9657887f 100644
--- a/build/ContinuousIntegration/TeamCity/on-checkin.proj
+++ b/build/TeamCity/on-checkin.proj
@@ -1,20 +1,20 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Go" ToolsVersion="4.0">
-  <UsingTask TaskName="Gallio.MSBuildTasks.Gallio" AssemblyFile="..\..\..\lib\Gallio_3.2.517.0\Gallio.MSBuildTasks.dll" />
-  <UsingTask TaskName="MSBuild.ExtensionPack.CodeQuality.StyleCop" AssemblyFile="..\..\MSBuild_Extension_Pack_3.5.5\StyleCop\MSBuild.ExtensionPack.StyleCop.dll" />
+  <UsingTask TaskName="Gallio.MSBuildTasks.Gallio" AssemblyFile="..\..\lib\Gallio_3.2.517.0\Gallio.MSBuildTasks.dll" />
+  <UsingTask TaskName="MSBuild.ExtensionPack.CodeQuality.StyleCop" AssemblyFile="..\MSBuild_Extension_Pack_3.5.5\StyleCop\MSBuild.ExtensionPack.StyleCop.dll" />
   
   <Target Name="Go" DependsOnTargets="Test; StyleCop;" />
    
   <Target Name="Test">
-    <Gallio.MSBuildTasks.Gallio ContinueOnError="False" IgnoreFailures="False" Files="../../../src/UnitTests/bin/Release/MathNet.Numerics.UnitTests.dll" />
-    <Exec Command="$(MSBuildProjectDirectory)/../../../src/FSharpUnitTests/bin/Release/FSharpUnitTests.exe" IgnoreExitCode="false" />
+    <Gallio.MSBuildTasks.Gallio ContinueOnError="False" IgnoreFailures="False" Files="../../out/test/Net40/MathNet.Numerics.UnitTests.dll" />
+    <Exec Command="$(MSBuildProjectDirectory)/../../out/test/Net40/FSharpUnitTests.exe" IgnoreExitCode="false" />
   </Target>
   
   <Target Name="StyleCop">
-    <CreateItem Include="../../../src/Numerics/**/*.cs">
+    <CreateItem Include="../../src/Numerics/**/*.cs">
       <Output TaskParameter="Include" ItemName="StyleCopFiles" />
     </CreateItem>
 
-    <MSBuild.ExtensionPack.CodeQuality.StyleCop TaskAction="Scan" SettingsFile="../../../src/Settings.StyleCop" SourceFiles="@(StyleCopFiles)" ShowOutput="true" ForceFullAnalysis="true" CacheResults="false" ContinueOnError="false">
+    <MSBuild.ExtensionPack.CodeQuality.StyleCop TaskAction="Scan" SettingsFile="../../src/Settings.StyleCop" SourceFiles="@(StyleCopFiles)" ShowOutput="true" ForceFullAnalysis="true" CacheResults="false" ContinueOnError="false">
       <Output TaskParameter="Succeeded" PropertyName="AllPassed" />
       <Output TaskParameter="ViolationCount" PropertyName="Violations" />
       <Output TaskParameter="FailedFiles" ItemName="Failures" />
@@ -24,7 +24,7 @@
   </Target>
   
   <Target Name="Gendarme">
-    <Exec Command="$(MSBuildProjectDirectory)\..\..\..\tools\Gendarme-2.4\gendarme.exe $(MSBuildProjectDirectory)\..\..\..\src\Numerics\bin\Debug\MathNet.Numerics.dll"/>
+    <Exec Command="$(MSBuildProjectDirectory)/../../tools/Gendarme-2.4/gendarme.exe $(MSBuildProjectDirectory)/../../out/lib/Net40/MathNet.Numerics.dll"/>
   </Target>
   
 </Project>
\ No newline at end of file