diff --git a/README.md b/README.md
index 02cf8f7..acf9e89 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
 # YamlTransform
+[![Build status](https://ci.appveyor.com/api/projects/status/8hlsio9gcq9u4416?svg=true)](https://ci.appveyor.com/project/berendhaan/ymltransform)
+[![Build status](https://ci.appveyor.com/api/projects/status/8hlsio9gcq9u4416/branch/master?svg=true)](https://ci.appveyor.com/project/berendhaan/ymltransform/branch/master)
+
+
 Transforms Sitecore Yml files during deployment. Like web transform for yml files.
diff --git a/src/YmlTransform/Models/Options.cs b/src/YmlTransform/Models/Options.cs
new file mode 100644
index 0000000..baf3acb
--- /dev/null
+++ b/src/YmlTransform/Models/Options.cs
@@ -0,0 +1,25 @@
+using CommandLine;
+
+namespace YmlTransform.Models
+{
+    class Options
+    {
+        /// <summary>
+        /// Path to folder containing .yml files
+        /// </summary>
+        [Option('p', "path", Required = true, HelpText = "Path to folder containing .yml files")]
+        public string Path { get; set; }
+
+        /// <summary>
+        /// Walk recursive through the folder structure
+        /// </summary>
+        [Option('r', "recursive", Required = false, HelpText = "Loop recursively", DefaultValue = false)]
+        public bool Recursive { get; set; }
+
+        /// <summary>
+        /// Path to the file containing the transformations
+        /// </summary>
+        [Option('t', "transform", Required = true, HelpText = "Transformation file")]
+        public string TransformFile { get; set; }
+    }
+}
diff --git a/src/YmlTransform/TransformItem.cs b/src/YmlTransform/Models/TransformItem.cs
similarity index 91%
rename from src/YmlTransform/TransformItem.cs
rename to src/YmlTransform/Models/TransformItem.cs
index 58ba582..29aae94 100644
--- a/src/YmlTransform/TransformItem.cs
+++ b/src/YmlTransform/Models/TransformItem.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace YmlTransform
+namespace YmlTransform.Models
 {
     class TransformItem
     {
diff --git a/src/YmlTransform/Program.cs b/src/YmlTransform/Program.cs
index 530d5a2..ee47c07 100644
--- a/src/YmlTransform/Program.cs
+++ b/src/YmlTransform/Program.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using CommandLine;
-using Rainbow.Model;
-using Rainbow.Storage.Yaml;
+using YmlTransform.Models;
 
 namespace YmlTransform
 {
@@ -21,17 +13,5 @@ static void Main(string[] args)
                 YmlTransformer.TransformPath(options.Path, options.TransformFile, options.Recursive);
             }
         }
-
-        class Options
-        {
-            [Option('p', "path", Required = true, HelpText = "Path to process")]
-            public string Path { get; set; }
-
-            [Option('r', "recursive", Required = false, HelpText = "Loop recursively", DefaultValue = false)]
-            public bool Recursive { get; set; }
-
-            [Option('t', "transform", Required = true, HelpText = "Transformation file")]
-            public string TransformFile { get; set; }
-        }
     }
 }
diff --git a/src/YmlTransform/YmlTransform.csproj b/src/YmlTransform/YmlTransform.csproj
index 77531b0..5d0caa4 100644
--- a/src/YmlTransform/YmlTransform.csproj
+++ b/src/YmlTransform/YmlTransform.csproj
@@ -77,9 +77,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Models\Options.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TransformItem.cs" />
+    <Compile Include="Models\TransformItem.cs" />
     <Compile Include="YmlTransformer.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/YmlTransform/YmlTransformer.cs b/src/YmlTransform/YmlTransformer.cs
index 95aa3c5..fa132f7 100644
--- a/src/YmlTransform/YmlTransformer.cs
+++ b/src/YmlTransform/YmlTransformer.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using Rainbow.Model;
 using Rainbow.Storage.Yaml;
+using YmlTransform.Models;
 
 namespace YmlTransform
 {
diff --git a/tests/YmlTransform.Tests/YmlTransform.Tests.csproj b/tests/YmlTransform.Tests/YmlTransform.Tests.csproj
index e300086..75d8286 100644
--- a/tests/YmlTransform.Tests/YmlTransform.Tests.csproj
+++ b/tests/YmlTransform.Tests/YmlTransform.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\xunit.runner.visualstudio.2.3.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -88,6 +89,9 @@
   <ItemGroup>
     <Analyzer Include="..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -95,6 +99,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" />
 </Project>
\ No newline at end of file
diff --git a/tests/YmlTransform.Tests/packages.config b/tests/YmlTransform.Tests/packages.config
index 1124a20..237e800 100644
--- a/tests/YmlTransform.Tests/packages.config
+++ b/tests/YmlTransform.Tests/packages.config
@@ -9,4 +9,5 @@
   <package id="xunit.core" version="2.3.0" targetFramework="net462" />
   <package id="xunit.extensibility.core" version="2.3.0" targetFramework="net462" />
   <package id="xunit.extensibility.execution" version="2.3.0" targetFramework="net462" />
+  <package id="xunit.runner.visualstudio" version="2.3.0" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file