diff --git a/Yavsc.Server/YavscServerFactory.cs b/Yavsc.Server/YavscServerFactory.cs
new file mode 100644
index 00000000..a1a6c5c6
--- /dev/null
+++ b/Yavsc.Server/YavscServerFactory.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Hosting.Server;
+using Microsoft.AspNet.Http.Features;
+using Microsoft.Extensions.Configuration;
+using Yavsc.Models;
+
+namespace Yavsc.Server
+{
+    public class YavscServerFactory : IServerFactory
+    {
+        public IFeatureCollection Initialize(IConfiguration configuration)
+        {
+            FeatureCollection featureCollection = new FeatureCollection();
+            return featureCollection;
+        }
+
+        public IDisposable Start(IFeatureCollection serverFeatures, Func<IFeatureCollection, Task> application)
+        {
+            var task = application(serverFeatures);
+            return task;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Yavsc/ApiControllers/MailTemplatingApiController.cs b/Yavsc/ApiControllers/MailTemplatingApiController.cs
new file mode 100644
index 00000000..a7cd9a7c
--- /dev/null
+++ b/Yavsc/ApiControllers/MailTemplatingApiController.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNet.Mvc;
+using Yavsc.Services;
+
+namespace Yavsc.ApiControllers
+{
+    [Route("api/mailtemplate")]
+    public class MailTemplatingApiController: Controller
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/cli.sln b/cli.sln
new file mode 100644
index 00000000..9fafdeca
--- /dev/null
+++ b/cli.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cli", "cli\cli.csproj", "{9580B70F-0C6F-4C5A-868D-97517BD51D55}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9580B70F-0C6F-4C5A-868D-97517BD51D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9580B70F-0C6F-4C5A-868D-97517BD51D55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9580B70F-0C6F-4C5A-868D-97517BD51D55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9580B70F-0C6F-4C5A-868D-97517BD51D55}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.DotNetNamingPolicy = $1
+		$1.DirectoryNamespaceAssociation = PrefixedHierarchical
+		$0.TextStylePolicy = $2
+		$2.inheritsSet = null
+		$2.scope = application/json
+		$0.StandardHeader = $3
+	EndGlobalSection
+EndGlobal