diff --git a/.gitignore b/.gitignore
index 360e510eeb..9f6e9fcaae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,11 +36,6 @@
 ##  If you have NuGet Package Restore enabled, uncomment this
 packages/
 ForSample/
-*NugetTaskBuild*
-*NugetRefBuild*
-*NugetExeBuild*
-*GitVersionTfsTaskBuild*
-*GemBuild*
 
 # Visual Studio profiler
 *.psess
@@ -83,11 +78,7 @@ Thumbs.db
 Desktop.ini
 
 _NCrunch_GitVersion
-NuGetCommandLineBuild/
 GitVersion.sln.ide/
 .vs/
-NuGetExeBuild/
-NuGetRefBuild/
 Packages/
-NuGetTaskBuild/
-GitVersionTfsTaskBuild/
\ No newline at end of file
+build/
diff --git a/build/Build.cmd b/Build.cmd
similarity index 74%
rename from build/Build.cmd
rename to Build.cmd
index 3da6b0e692..364d1ab554 100644
--- a/build/Build.cmd
+++ b/Build.cmd
@@ -1,7 +1,7 @@
 @echo on
 
 set framework=v4.0.30319
-set src=%~dp0..\src\
+set src=%~dp0src\
 
 "%src%.nuget\nuget.exe" restore %src%
 
@@ -10,8 +10,8 @@ set src=%~dp0..\src\
 rmdir /s /q "%tmp%GitVersion"
 md "%tmp%GitVersion"
 
-xcopy /E "%~dp0NuGetCommandLineBuild\tools" "%tmp%GitVersion"
+xcopy /E "%~dp0build\NuGetCommandLineBuild\tools" "%tmp%GitVersion"
 
 "%tmp%GitVersion\GitVersion.exe" /l console /output buildserver /updateAssemblyInfo /proj "%src%GitVersion.sln"
 
-rmdir  /s /q "%tmp%GitVersion" 
+rmdir /s /q "%tmp%GitVersion"
diff --git a/appveyor.yml b/appveyor.yml
index 62cf32695e..1d4c46c172 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,6 @@ build_script:
   - cmd: 7z a "GitVersion_%GitVersion_NuGetVersion%.zip" -r .\build\NuGetCommandLineBuild\Tools\*.*
   - cmd: appveyor PushArtifact "GitVersion_%GitVersion_NuGetVersion%.zip"
 
-  - ps: .\build\Update-GitVersionTfsTaskVersion.ps1 .\build\GitVersionTfsTaskBuild\task.json $env:GitVersion_Major $env:GitVersion_Minor $env:GitVersion_Patch
   - cmd: 7z a "GitVersionTfsBuildTask_%GitVersion_NuGetVersion%.zip" -r .\build\GitVersionTfsTaskBuild\*.*
   - cmd: appveyor PushArtifact "GitVersionTfsBuildTask_%GitVersion_NuGetVersion%.zip"
 
diff --git a/build/GitVersionVsoTaskBuild/icon.png b/build/GitVersionVsoTaskBuild/icon.png
deleted file mode 100644
index fe52c661cb..0000000000
Binary files a/build/GitVersionVsoTaskBuild/icon.png and /dev/null differ
diff --git a/build/GitVersionVsoTaskBuild/task.json b/build/GitVersionVsoTaskBuild/task.json
deleted file mode 100644
index 51a7655e8f..0000000000
--- a/build/GitVersionVsoTaskBuild/task.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "e5983830-3f75-11e5-82ed-81492570a08e",
-  "name": "GitVersion",
-  "friendlyName": "GitVersion Task",
-  "description": "Easy Semantic Versioning (http://semver.org) for projects using Git",
-  "author": "GitTools and Contributors",
-  "helpMarkDown": "See the [documentation](http://gitversion.readthedocs.org/en/latest/) for help",
-  "category": "Build",
-  "visibility": [
-    "Build",
-    "Release"
-  ],
-  "demands": [],
-  "version": {
-    "Major": "0",
-    "Minor": "0",
-    "Patch": "0"
-  },
-  "minimumAgentVersion": "1.83.0",
-  "groups": [
-    {
-      "name": "additional",
-      "displayName": "Additional Options",
-      "isExpanded": false
-    }
-  ],
-  "instanceNameFormat": "GitVersion",
-  "inputs": [
-    {
-      "name": "updateAssemblyInfo",
-      "type": "boolean",
-      "label": "Update AssemblyInfo files",
-      "defaultValue": "false",
-      "required": false,
-      "helpMarkDown": "Whether to update versions in the AssemblyInfo files"
-    },
-    {
-      "name": "additionalArguments",
-      "type": "string",
-      "label": "Additional GitVersion.exe arguments",
-      "defaultValue": "",
-      "required": false,
-      "helpMarkDown": "Additional arguments to send to GitVersion.exe",
-      "groupName": "additional"
-    }
-  ],
-  "execution": {  
-    "Process": {
-      "target": "$(currentDirectory)\\GitVersion.exe",
-      "argumentFormat": "\"$(Build.SourcesDirectory)\" /output buildserver /updateAssemblyInfo $(updateAssemblyInfo) /nofetch $(additionalArguments)",
-      "workingDirectory": "$(currentDirectory)"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/GitVersion.sln b/src/GitVersion.sln
index 4b783ef413..e18e477ba2 100644
--- a/src/GitVersion.sln
+++ b/src/GitVersion.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23103.0
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionExe", "GitVersionExe\GitVersionExe.csproj", "{C3578A7B-09A6-4444-9383-0DEAFA4958BD}"
 EndProject
@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		..\appveyor.yml = ..\appveyor.yml
 		..\BREAKING CHANGES.md = ..\BREAKING CHANGES.md
-		..\build\Build.cmd = ..\build\Build.cmd
+		..\Build.cmd = ..\Build.cmd
 		..\CONTRIBUTING.md = ..\CONTRIBUTING.md
 		..\GitVersionConfig.yaml = ..\GitVersionConfig.yaml
 		..\LICENSE = ..\LICENSE
diff --git a/src/GitVersionCore/BuildServers/AppVeyor.cs b/src/GitVersionCore/BuildServers/AppVeyor.cs
index 1d9bafafbb..fb656a909e 100644
--- a/src/GitVersionCore/BuildServers/AppVeyor.cs
+++ b/src/GitVersionCore/BuildServers/AppVeyor.cs
@@ -13,12 +13,13 @@ public override bool CanApplyToCurrentContext()
 
         public override string GenerateSetVersionMessage(VersionVariables variables)
         {
+            var buildNumber = Environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER");
             var restBase = Environment.GetEnvironmentVariable("APPVEYOR_API_URL");
 
             var request = (HttpWebRequest)WebRequest.Create(restBase + "api/build");
             request.Method = "PUT";
 
-            var data = string.Format("{{ \"version\": \"{0}\" }}", variables.FullSemVer);
+            var data = string.Format("{{ \"version\": \"{0}.build.{1}\" }}", variables.FullSemVer, buildNumber);
             var bytes = Encoding.UTF8.GetBytes(data);
             request.ContentLength = bytes.Length;
             request.ContentType = "application/json";
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
index 43e5f5f95f..12c033e9c2 100644
--- a/src/GitVersionExe/GitVersionExe.csproj
+++ b/src/GitVersionExe/GitVersionExe.csproj
@@ -166,7 +166,7 @@
     <Copy SourceFiles="$(OutputPath)ILMergeTemp\GitVersion.exe" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
     <Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\icon.png" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
     <Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\task.json" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
-    <Exec Command="powershell -ExecutionPolicy RemoteSigned -NoProfile &quot;$(BuildDir)\Update-GitVersionTfsTaskVersion.ps1 $(BuildDir)GitVersionTfsTaskBuild\task.json $(GitVersion_Major) $(GitVersion_Minor) $(GitVersion_Patch)&quot;" WorkingDirectory="$(BuildDir)" Condition="'$(GitVersion_SemVer)' != ''" />
+    <Exec Command="powershell -ExecutionPolicy RemoteSigned -NoProfile &quot;$(SolutionDir)Update-GitVersionTfsTaskVersion.ps1 $(BuildDir)GitVersionTfsTaskBuild\task.json $(GitVersion_Major) $(GitVersion_Minor) $(GitVersion_Patch)&quot;" WorkingDirectory="$(BuildDir)" Condition="'$(GitVersion_SemVer)' != ''" />
     <!-- Gem -->
     <MakeDir Directories="$(BuildDir)GemBuild" />
     <Copy SourceFiles="@(amd64)" DestinationFolder="$(BuildDir)GemBuild\bin\NativeBinaries\amd64" />
diff --git a/build/Update-GitVersionTfsTaskVersion.ps1 b/src/Update-GitVersionTfsTaskVersion.ps1
similarity index 100%
rename from build/Update-GitVersionTfsTaskVersion.ps1
rename to src/Update-GitVersionTfsTaskVersion.ps1