diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.0.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.0.nupkg
deleted file mode 100644
index 4175a1ac..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.0.nupkg and /dev/null differ
diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.1.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.1.nupkg
deleted file mode 100644
index 4aae436a..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.1.nupkg and /dev/null differ
diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.2.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.2.nupkg
deleted file mode 100644
index 944eb513..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.2.nupkg and /dev/null differ
diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.3.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.3.nupkg
deleted file mode 100644
index d5387598..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.3.nupkg and /dev/null differ
diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.4.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.4.nupkg
deleted file mode 100644
index bd13d974..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.4.nupkg and /dev/null differ
diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc1.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc1.nupkg
deleted file mode 100644
index b0ceb5f0..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc1.nupkg and /dev/null differ
diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc2.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc2.nupkg
deleted file mode 100644
index 1c92ccc2..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc2.nupkg and /dev/null differ
diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc3.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc3.nupkg
deleted file mode 100644
index 9f88815e..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc3.nupkg and /dev/null differ
diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc4.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc4.nupkg
deleted file mode 100644
index 03f8a953..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc4.nupkg and /dev/null differ
diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc5.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc5.nupkg
deleted file mode 100644
index dfde01ff..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc5.nupkg and /dev/null differ
diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc6.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc6.nupkg
deleted file mode 100644
index c15f2880..00000000
Binary files a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc6.nupkg and /dev/null differ
diff --git a/Yavsc/Templates/UserOrientedTemplate.cs b/Yavsc.Server/Templates/UserOrientedTemplate.cs
similarity index 100%
rename from Yavsc/Templates/UserOrientedTemplate.cs
rename to Yavsc.Server/Templates/UserOrientedTemplate.cs
diff --git a/cli/Services/EMailer.cs b/cli/Services/EMailer.cs
index 3ef64058..b6aa3d48 100644
--- a/cli/Services/EMailer.cs
+++ b/cli/Services/EMailer.cs
@@ -102,18 +102,24 @@ namespace cli.Services
                 MetadataReference.CreateFromFile( typeof(Enumerable).Assembly.Location),
                 MetadataReference.CreateFromFile( typeof(IdentityUser).Assembly.Location),
                 MetadataReference.CreateFromFile( typeof(ApplicationUser).Assembly.Location),
-                MetadataReference.CreateFromFile( typeof(Template).Assembly.Location)
+                MetadataReference.CreateFromFile( typeof(Template).Assembly.Location),
+                MetadataReference.CreateFromFile( typeof(UserOrientedTemplate).Assembly.Location)
                 };
+                logger.LogInformation("typeof(Template).Assembly.Location: "+typeof(Template).Assembly.Location);
+                
 
                 var compilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
                     .WithAllowUnsafe(true).WithOptimizationLevel(OptimizationLevel.Release)
-                    .WithOutputKind(OutputKind.DynamicallyLinkedLibrary).WithPlatform(Platform.AnyCpu);
+                    .WithOutputKind(OutputKind.DynamicallyLinkedLibrary).WithPlatform(Platform.AnyCpu)
+                    .WithUsings("Yavsc.Templates")
+                    ;
 
                 CSharpCompilation compilation = CSharpCompilation.Create(
                     assemblyName,
                     syntaxTrees: new[] { syntaxTree },
                     references: references,
-                    options: compilationOptions);
+                    options: compilationOptions
+                    );
 
 
                 using (var ms = new MemoryStream())
diff --git a/cli/project.json b/cli/project.json
index 8037ae7a..f8fdd991 100644
--- a/cli/project.json
+++ b/cli/project.json
@@ -44,8 +44,9 @@
         "Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
         "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
         "Newtonsoft.Json": "9.0.1",
-        "Yavsc.Abstract": { "version": "1.0.5-rc18-alpha1", "target": "package" },
-        "Yavsc.Server": { "version": "1.0.5-rc18-alpha1", "target": "package" }
+        "Yavsc.Abstract": { "version": "1.0.5-rc20-alpha4", "target": "package" },
+        "Yavsc.Server": { "version": "1.0.5-rc20-alpha4", "target": "package" },
+        "Yavsc": { "version": "1.0.5-rc20-alpha4", "target": "package" }
     },
     "frameworks": {
         "dnx451": {}
diff --git a/cli/project.lock.json b/cli/project.lock.json
index 04a09547..9009aa02 100644
--- a/cli/project.lock.json
+++ b/cli/project.lock.json
@@ -2108,7 +2108,20 @@
           "lib/net45/_._": {}
         }
       },
-      "Yavsc.Abstract/1.0.5-rc18-alpha1": {
+      "Yavsc/1.0.5-rc20-alpha4": {
+        "type": "package",
+        "dependencies": {
+          "Yavsc.Abstract": "1.0.5-rc20-alpha4",
+          "Yavsc.Server": "1.0.5-rc20-alpha4"
+        },
+        "compile": {
+          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+        }
+      },
+      "Yavsc.Abstract/1.0.5-rc20-alpha4": {
         "type": "package",
         "compile": {
           "lib/dnx451/Yavsc.Abstract.dll": {}
@@ -2117,14 +2130,10 @@
           "lib/dnx451/Yavsc.Abstract.dll": {}
         }
       },
-      "Yavsc.Server/1.0.5-rc18-alpha1": {
+      "Yavsc.Server/1.0.5-rc20-alpha4": {
         "type": "package",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
-          "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
-          "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
-          "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
-          "Yavsc.Abstract": "1.0.5-rc18-alpha1"
+          "Yavsc.Abstract": "1.0.5-rc20-alpha4"
         },
         "compile": {
           "lib/dnx451/Yavsc.Server.dll": {}
@@ -4240,7 +4249,20 @@
           "lib/net45/_._": {}
         }
       },
-      "Yavsc.Abstract/1.0.5-rc18-alpha1": {
+      "Yavsc/1.0.5-rc20-alpha4": {
+        "type": "package",
+        "dependencies": {
+          "Yavsc.Abstract": "1.0.5-rc20-alpha4",
+          "Yavsc.Server": "1.0.5-rc20-alpha4"
+        },
+        "compile": {
+          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+        }
+      },
+      "Yavsc.Abstract/1.0.5-rc20-alpha4": {
         "type": "package",
         "compile": {
           "lib/dnx451/Yavsc.Abstract.dll": {}
@@ -4249,14 +4271,10 @@
           "lib/dnx451/Yavsc.Abstract.dll": {}
         }
       },
-      "Yavsc.Server/1.0.5-rc18-alpha1": {
+      "Yavsc.Server/1.0.5-rc20-alpha4": {
         "type": "package",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
-          "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
-          "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
-          "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
-          "Yavsc.Abstract": "1.0.5-rc18-alpha1"
+          "Yavsc.Abstract": "1.0.5-rc20-alpha4"
         },
         "compile": {
           "lib/dnx451/Yavsc.Server.dll": {}
@@ -6372,7 +6390,20 @@
           "lib/net45/_._": {}
         }
       },
-      "Yavsc.Abstract/1.0.5-rc18-alpha1": {
+      "Yavsc/1.0.5-rc20-alpha4": {
+        "type": "package",
+        "dependencies": {
+          "Yavsc.Abstract": "1.0.5-rc20-alpha4",
+          "Yavsc.Server": "1.0.5-rc20-alpha4"
+        },
+        "compile": {
+          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll": {}
+        }
+      },
+      "Yavsc.Abstract/1.0.5-rc20-alpha4": {
         "type": "package",
         "compile": {
           "lib/dnx451/Yavsc.Abstract.dll": {}
@@ -6381,14 +6412,10 @@
           "lib/dnx451/Yavsc.Abstract.dll": {}
         }
       },
-      "Yavsc.Server/1.0.5-rc18-alpha1": {
+      "Yavsc.Server/1.0.5-rc20-alpha4": {
         "type": "package",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
-          "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
-          "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
-          "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
-          "Yavsc.Abstract": "1.0.5-rc18-alpha1"
+          "Yavsc.Abstract": "1.0.5-rc20-alpha4"
         },
         "compile": {
           "lib/dnx451/Yavsc.Server.dll": {}
@@ -8521,25 +8548,35 @@
         "system.threading.nuspec"
       ]
     },
-    "Yavsc.Abstract/1.0.5-rc18-alpha1": {
+    "Yavsc/1.0.5-rc20-alpha4": {
       "type": "package",
-      "sha512": "q2VsP/RskRF6xxTcNPwQcRYServTFLs7POz8l2TYCTmm+bYpRoG8e9J0DGyGYzBiQMlCFUa6iZuBsrq6s0y2AA==",
+      "sha512": "l/ill88DnIP2OeWDOSZJMTCx/pB1JPrQrFvQIwcNi4ya/kLRG22LUIQbGuU77fEuwZjB7rfBzEZkgoI1wf1oNw==",
+      "files": [
+        "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll",
+        "Yavsc.1.0.5-rc20-alpha4.nupkg",
+        "Yavsc.1.0.5-rc20-alpha4.nupkg.sha512",
+        "Yavsc.nuspec"
+      ]
+    },
+    "Yavsc.Abstract/1.0.5-rc20-alpha4": {
+      "type": "package",
+      "sha512": "raNWJLbT+Nti3orI0BcUFlsgP3jakLPzpT+5mozlJJ7B6hDIbpDRSWKe++8cslHzrq2EY1NHC8U3LtAkP5rQgA==",
       "files": [
         "lib/dnx451/Yavsc.Abstract.dll",
         "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Abstract.dll",
-        "Yavsc.Abstract.1.0.5-rc18-alpha1.nupkg",
-        "Yavsc.Abstract.1.0.5-rc18-alpha1.nupkg.sha512",
+        "Yavsc.Abstract.1.0.5-rc20-alpha4.nupkg",
+        "Yavsc.Abstract.1.0.5-rc20-alpha4.nupkg.sha512",
         "Yavsc.Abstract.nuspec"
       ]
     },
-    "Yavsc.Server/1.0.5-rc18-alpha1": {
+    "Yavsc.Server/1.0.5-rc20-alpha4": {
       "type": "package",
-      "sha512": "7pdsr3YityWyspVp3iMhEajB569NeaowkpFH4qh8nYDy05QA59MxdZjSiDIAqAYU+P04nwhPGnadIKBCnx9b4g==",
+      "sha512": "kiKsUo0MBg88ZDHOHEtZHGlMObyiwKqwtLWh1ZwXcUqNpEcK/46AJpRzCt9uXNc0UEdLQ8Bna/9FzYQfZA8RKg==",
       "files": [
         "lib/dnx451/Yavsc.Server.dll",
         "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.Server.dll",
-        "Yavsc.Server.1.0.5-rc18-alpha1.nupkg",
-        "Yavsc.Server.1.0.5-rc18-alpha1.nupkg.sha512",
+        "Yavsc.Server.1.0.5-rc20-alpha4.nupkg",
+        "Yavsc.Server.1.0.5-rc20-alpha4.nupkg.sha512",
         "Yavsc.Server.nuspec"
       ]
     }
@@ -8572,8 +8609,9 @@
       "Microsoft.Framework.Configuration.Json >= 1.0.0-beta8",
       "Microsoft.Framework.ConfigurationModel.Json >= 1.0.0-beta4",
       "Newtonsoft.Json >= 9.0.1",
-      "Yavsc.Abstract >= 1.0.5-rc18-alpha1",
-      "Yavsc.Server >= 1.0.5-rc18-alpha1"
+      "Yavsc.Abstract >= 1.0.5-rc20-alpha4",
+      "Yavsc.Server >= 1.0.5-rc20-alpha4",
+      "Yavsc >= 1.0.5-rc20-alpha4"
     ],
     "DNX,Version=v4.5.1": []
   }
diff --git a/dnx.mk b/dnx.mk
index 84b8169c..d74f6cd7 100644
--- a/dnx.mk
+++ b/dnx.mk
@@ -62,7 +62,7 @@ bin/output/wwwroot/version: bin/output
 
 $(NUGETSOURCE)/$(PKGFILENAME): $(BINTARGETPATH) $(SOLUTIONDIR)/rc-num.txt
 ifeq ($(git_status),0)
-	nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) -OutputDirectory $(NUGETSOURCE)/$(PRJNAME)
+	nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) -OutputDirectory $(NUGETSOURCE)
 else
 	$(error Please, commit your changes before publishing your NuGet packages)
 endif
diff --git a/rc-num.txt b/rc-num.txt
index 75a0af6f..ea27ef16 100644
--- a/rc-num.txt
+++ b/rc-num.txt
@@ -1 +1 @@
-20-alpha3
\ No newline at end of file
+20-alpha4