From ebaebdfa2cbed7692ffc0e51cdc3a013d574b905 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sun, 26 Jul 2015 12:21:26 +0200
Subject: [PATCH] Move uRelease and adjust uRelease namespaces to be correct

---
 .gitignore                                    |   2 +-
 OurUmbraco.Site/OurUmbraco.Site.csproj        |   4 -
 .../MacroPartials/Releases/AllReleases.cshtml |   3 +-
 OurUmbraco.Site/masterpages/Download.master   |   2 +-
 OurUmbraco.Site/masterpages/Release.master    |   4 +-
 .../masterpages/ReleaseLanding.master         |   5 +-
 .../masterpages/ReleaseProgress.master        |   3 +-
 OurUmbraco.Site/masterpages/RoadMap.master    |   3 +-
 .../dashboard/ForceYouTrackDownload.ascx      |   3 +-
 OurUmbraco/OurUmbraco.csproj                  |  27 ++
 .../Release}/App_Start/ControllerRouting.cs   |  38 +--
 .../Release}/Controllers/NodeExtensions.cs    |   5 +-
 {uRelease => OurUmbraco/Release}/Download.cs  |   5 +-
 .../Release}/Extensions.cs                    | 137 +++++-----
 {uRelease => OurUmbraco/Release}/Import.cs    |  17 +-
 .../Release}/Models/AggregateView.cs          | 239 +++++++++---------
 .../Release}/Models/Comment.cs                |   2 +-
 .../Release}/Models/Version.cs                |  80 +++---
 .../Release}/Models/YouTrackComment.cs        |   2 +-
 .../Release}/Models/YouTrackField.cs          |   2 +-
 .../Release}/Models/YouTrackIssue.cs          |   2 +-
 {uRelease => OurUmbraco/Release}/Release.cs   |   4 +-
 {uRelease => OurUmbraco/Release}/Roadmap.cs   |   4 +-
 {uRelease => OurUmbraco/Release}/Versions.cs  |   4 +-
 OurUmbraco/packages.config                    |   3 +
 our.umbraco.org.sln                           |  12 -
 our.umbraco.org/Scheduling/YouTrackSync.cs    |   2 +-
 our.umbraco.org/our.umbraco.org.csproj        |   4 -
 uRelease/uRelease.csproj                      |  14 -
 29 files changed, 312 insertions(+), 320 deletions(-)
 rename {uRelease => OurUmbraco/Release}/App_Start/ControllerRouting.cs (87%)
 rename {uRelease => OurUmbraco/Release}/Controllers/NodeExtensions.cs (77%)
 rename {uRelease => OurUmbraco/Release}/Download.cs (91%)
 rename {uRelease => OurUmbraco/Release}/Extensions.cs (90%)
 rename {uRelease => OurUmbraco/Release}/Import.cs (96%)
 rename {uRelease => OurUmbraco/Release}/Models/AggregateView.cs (92%)
 rename {uRelease => OurUmbraco/Release}/Models/Comment.cs (94%)
 rename {uRelease => OurUmbraco/Release}/Models/Version.cs (92%)
 rename {uRelease => OurUmbraco/Release}/Models/YouTrackComment.cs (94%)
 rename {uRelease => OurUmbraco/Release}/Models/YouTrackField.cs (78%)
 rename {uRelease => OurUmbraco/Release}/Models/YouTrackIssue.cs (89%)
 rename {uRelease => OurUmbraco/Release}/Release.cs (91%)
 rename {uRelease => OurUmbraco/Release}/Roadmap.cs (92%)
 rename {uRelease => OurUmbraco/Release}/Versions.cs (88%)

diff --git a/.gitignore b/.gitignore
index 327d1a16..3e191eab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ dependencies/Marketplace*
 [Bb]in
 [Db]ebug*/
 obj/
-[Rr]elease*/
+[Bb]in/[Rr]elease*/
 _ReSharper*/
 *.ncrunchsolution
 *.ncrunchsolution.user
diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj
index b4f83cee..8afec162 100644
--- a/OurUmbraco.Site/OurUmbraco.Site.csproj
+++ b/OurUmbraco.Site/OurUmbraco.Site.csproj
@@ -4734,10 +4734,6 @@
       <Project>{547c2d0d-1b55-493b-ae0b-e031a5b8ee77}</Project>
       <Name>uForum</Name>
     </ProjectReference>
-    <ProjectReference Include="..\uRelease\uRelease.csproj">
-      <Project>{c5b74e6a-abce-4a9a-896d-89c33fdafcd8}</Project>
-      <Name>uRelease</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\migrations\" />
diff --git a/OurUmbraco.Site/Views/MacroPartials/Releases/AllReleases.cshtml b/OurUmbraco.Site/Views/MacroPartials/Releases/AllReleases.cshtml
index 1fa95f1e..752883d0 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Releases/AllReleases.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Releases/AllReleases.cshtml
@@ -1,3 +1,4 @@
+@using OurUmbraco.Release
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @{
@@ -15,7 +16,7 @@
     }
 
     var majorVersionGroups = sortedVersions.GroupBy(x => x.Key.Major).OrderByDescending(x => x.Key);
-    var allVersions = new uRelease.Versions();
+    var allVersions = new Versions();
     var youTrackVersions = allVersions.GetAggregateVersionsFromFile();
 }
 
diff --git a/OurUmbraco.Site/masterpages/Download.master b/OurUmbraco.Site/masterpages/Download.master
index 20df4771..757cb708 100644
--- a/OurUmbraco.Site/masterpages/Download.master
+++ b/OurUmbraco.Site/masterpages/Download.master
@@ -1,5 +1,5 @@
 <%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %>
-<%@ Import Namespace="uRelease" %>
+<%@ Import Namespace="OurUmbraco.Release" %>
 
 
 <asp:Content ID="Content1" ContentPlaceHolderID="Head" runat="server">
diff --git a/OurUmbraco.Site/masterpages/Release.master b/OurUmbraco.Site/masterpages/Release.master
index d8f31026..3ab7546b 100644
--- a/OurUmbraco.Site/masterpages/Release.master
+++ b/OurUmbraco.Site/masterpages/Release.master
@@ -1,6 +1,6 @@
 <%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %>
 <%@ Import Namespace="Umbraco.Web" %>
-<%@ Import Namespace="uRelease" %>
+<%@ Import Namespace="OurUmbraco.Release" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderId="Head" runat="server">
 </asp:Content>
@@ -24,7 +24,7 @@
     </umbraco:Macro>
 <%
     var currentPage = UmbracoContext.Current.PublishedContentRequest.PublishedContent;
-    var allReleases = uRelease.Release.GetAllReleaseFromFile();
+    var allReleases = Release.GetAllReleaseFromFile();
     var release = allReleases.First(x => x.version == currentPage.Name);
     var completedIssues = release.issues.Count(x => x.state == "Fixed");
     var totalIssues = release.issues.Count();
diff --git a/OurUmbraco.Site/masterpages/ReleaseLanding.master b/OurUmbraco.Site/masterpages/ReleaseLanding.master
index 36fcad7e..a06ab76f 100644
--- a/OurUmbraco.Site/masterpages/ReleaseLanding.master
+++ b/OurUmbraco.Site/masterpages/ReleaseLanding.master
@@ -1,11 +1,12 @@
 <%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %>
-  
+<%@ Import Namespace="OurUmbraco.Release" %>
+
 <asp:Content ID="Content1" ContentPlaceHolderId="Head" runat="server">
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderId="Main" runat="server">    
 <%
-    var allReleases = uRelease.Release.GetAllReleaseFromFile();
+    var allReleases = Release.GetAllReleaseFromFile();
 %>
 <div class="has-sidebar"><!-- Apply to body -->
 
diff --git a/OurUmbraco.Site/masterpages/ReleaseProgress.master b/OurUmbraco.Site/masterpages/ReleaseProgress.master
index 267c7381..e47fb98c 100644
--- a/OurUmbraco.Site/masterpages/ReleaseProgress.master
+++ b/OurUmbraco.Site/masterpages/ReleaseProgress.master
@@ -1,10 +1,11 @@
 <%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %>
+<%@ Import Namespace="OurUmbraco.Release" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="Head" runat="server">
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="Main" runat="server">
     <%
-        var allReleases = uRelease.Release.GetAllReleaseFromFile();
+        var allReleases = Release.GetAllReleaseFromFile();
         var inProgress = allReleases.Where(x => x.inProgressRelease).ToList();
     %>
     <div class="has-sidebar">
diff --git a/OurUmbraco.Site/masterpages/RoadMap.master b/OurUmbraco.Site/masterpages/RoadMap.master
index f62265e3..981a625b 100644
--- a/OurUmbraco.Site/masterpages/RoadMap.master
+++ b/OurUmbraco.Site/masterpages/RoadMap.master
@@ -1,4 +1,5 @@
 <%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %>
+<%@ Import Namespace="OurUmbraco.Release" %>
 <asp:Content ContentPlaceHolderID="Head" runat="server">
     <% if (Request.Url.AbsolutePath.ToLowerInvariant() == "/roadmap/" || Request.Url.AbsolutePath.ToLowerInvariant() == "/roadmap")
         {
@@ -29,7 +30,7 @@
             <h2>Planned Releases:</h2>
 
         </div>
-        <% var roadmap = uRelease.Roadmap.GetRoadmapReleasesFromFile(); %>
+        <% var roadmap = Roadmap.GetRoadmapReleasesFromFile(); %>
         <% foreach (var release in roadmap.OrderBy(x => x.version))
             {
                 var completedIssues = release.issues.Count(x => x.state == "Fixed");
diff --git a/OurUmbraco.Site/usercontrols/dashboard/ForceYouTrackDownload.ascx b/OurUmbraco.Site/usercontrols/dashboard/ForceYouTrackDownload.ascx
index 9072c47e..83e86819 100644
--- a/OurUmbraco.Site/usercontrols/dashboard/ForceYouTrackDownload.ascx
+++ b/OurUmbraco.Site/usercontrols/dashboard/ForceYouTrackDownload.ascx
@@ -1,4 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.UserControl" %>
+<%@ Import Namespace="OurUmbraco.Release" %>
 
 <script runat="server">
 
@@ -13,7 +14,7 @@
     
     void GetYouTrackButton_Click(object sender, EventArgs e)
     {
-        var import = new uRelease.Import();
+        var import = new Import();
         var result = import.SaveAllToFile();
         Status = result;
     }
diff --git a/OurUmbraco/OurUmbraco.csproj b/OurUmbraco/OurUmbraco.csproj
index 09b172f9..f804ac40 100644
--- a/OurUmbraco/OurUmbraco.csproj
+++ b/OurUmbraco/OurUmbraco.csproj
@@ -65,6 +65,10 @@
       <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="EasyHttp, Version=1.6.29.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EasyHttp.1.6.29.0\lib\net40\EasyHttp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Examine, Version=0.1.65.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Examine.0.1.65.0\lib\Examine.dll</HintPath>
       <Private>True</Private>
@@ -89,6 +93,10 @@
       <HintPath>..\packages\UmbracoCms.Core.7.2.8-build103\lib\interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="JsonFx, Version=2.0.1209.2802, Culture=neutral, PublicKeyToken=315052dd637f8a52, processorArchitecture=MSIL">
+      <HintPath>..\packages\JsonFx.2.0.1209.2802\lib\net40\JsonFx.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Core.7.2.8-build103\lib\log4net.dll</HintPath>
       <Private>True</Private>
@@ -231,6 +239,10 @@
       <HintPath>..\packages\UmbracoCms.Core.7.2.8-build103\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="YouTrackSharp, Version=2.0.11.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\YouTrackSharp.2.0.11.0\lib\net40\YouTrackSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Documentation\Busineslogic\ConventionExtensions.cs" />
@@ -259,6 +271,20 @@
     <Compile Include="Powers\Library\Utils.cs" />
     <Compile Include="Powers\Library\xslt.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Release\App_Start\ControllerRouting.cs" />
+    <Compile Include="Release\Controllers\NodeExtensions.cs" />
+    <Compile Include="Release\Download.cs" />
+    <Compile Include="Release\Extensions.cs" />
+    <Compile Include="Release\Import.cs" />
+    <Compile Include="Release\Models\AggregateView.cs" />
+    <Compile Include="Release\Models\Comment.cs" />
+    <Compile Include="Release\Models\Version.cs" />
+    <Compile Include="Release\Models\YouTrackComment.cs" />
+    <Compile Include="Release\Models\YouTrackField.cs" />
+    <Compile Include="Release\Models\YouTrackIssue.cs" />
+    <Compile Include="Release\Release.cs" />
+    <Compile Include="Release\Roadmap.cs" />
+    <Compile Include="Release\Versions.cs" />
     <Compile Include="Repository\Project.cs" />
     <Compile Include="Repository\Projects.cs" />
     <Compile Include="Repository\RepoStartupHandler.cs" />
@@ -301,6 +327,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Forum\" />
     <Folder Include="Repository\webservices\App_Data\" />
     <Folder Include="Wiki\usercontrols\scripts\" />
   </ItemGroup>
diff --git a/uRelease/App_Start/ControllerRouting.cs b/OurUmbraco/Release/App_Start/ControllerRouting.cs
similarity index 87%
rename from uRelease/App_Start/ControllerRouting.cs
rename to OurUmbraco/Release/App_Start/ControllerRouting.cs
index b4c41a5d..835200e3 100644
--- a/uRelease/App_Start/ControllerRouting.cs
+++ b/OurUmbraco/Release/App_Start/ControllerRouting.cs
@@ -1,20 +1,20 @@
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
-using uRelease;
-
-[assembly: PreApplicationStartMethod(typeof(ControllerRouting), "Setup")]
-namespace uRelease
-{
-    public class ControllerRouting
-    {
-        public static void Setup()
-        {
-            RouteTable.Routes.MapRoute(
-                "ApiRoute", // Route name
-                "api/{action}/{ids}", // URL with parameters
-                new { controller = "Api", action = "Aggregate", ids = UrlParameter.Optional } // Parameter defaults
-                );
-        }
-    }
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+using OurUmbraco.Release.App_Start;
+
+[assembly: PreApplicationStartMethod(typeof(ControllerRouting), "Setup")]
+namespace OurUmbraco.Release.App_Start
+{
+    public class ControllerRouting
+    {
+        public static void Setup()
+        {
+            RouteTable.Routes.MapRoute(
+                "ApiRoute", // Route name
+                "api/{action}/{ids}", // URL with parameters
+                new { controller = "Api", action = "Aggregate", ids = UrlParameter.Optional } // Parameter defaults
+                );
+        }
+    }
 }
\ No newline at end of file
diff --git a/uRelease/Controllers/NodeExtensions.cs b/OurUmbraco/Release/Controllers/NodeExtensions.cs
similarity index 77%
rename from uRelease/Controllers/NodeExtensions.cs
rename to OurUmbraco/Release/Controllers/NodeExtensions.cs
index 62e9f9c2..e4b54029 100644
--- a/uRelease/Controllers/NodeExtensions.cs
+++ b/OurUmbraco/Release/Controllers/NodeExtensions.cs
@@ -1,7 +1,6 @@
-using System.Linq;
-using umbraco.interfaces;
+using umbraco.interfaces;
 
-namespace uRelease.Controllers
+namespace OurUmbraco.Release.Controllers
 {
     public static class NodeExtensions
     {
diff --git a/uRelease/Download.cs b/OurUmbraco/Release/Download.cs
similarity index 91%
rename from uRelease/Download.cs
rename to OurUmbraco/Release/Download.cs
index 14ce25b3..b456b5ca 100644
--- a/uRelease/Download.cs
+++ b/OurUmbraco/Release/Download.cs
@@ -3,10 +3,9 @@ using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Script.Serialization;
-using uRelease.Controllers;
-using uRelease.Models;
+using OurUmbraco.Release.Models;
 
-namespace uRelease
+namespace OurUmbraco.Release
 {
     public static class Download
     {
diff --git a/uRelease/Extensions.cs b/OurUmbraco/Release/Extensions.cs
similarity index 90%
rename from uRelease/Extensions.cs
rename to OurUmbraco/Release/Extensions.cs
index 16231a91..9ee8cfbe 100644
--- a/uRelease/Extensions.cs
+++ b/OurUmbraco/Release/Extensions.cs
@@ -1,70 +1,69 @@
-using System;
-using System.Linq;
-using uRelease.Models;
-using Version = System.Version;
-
-namespace uRelease
-{
-    public static class Extensions
-    {
-        public static DateTime JavaTimeStampToDateTime(double javaTimeStamp)
-        {
-            // Java timestamp is millisecods past epoch
-            var dtDateTime = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-            dtDateTime = dtDateTime.AddSeconds(Math.Round(javaTimeStamp / 1000)).ToLocalTime();
-            return dtDateTime;
-        }
-        
-        /// <summary>
-        /// Return the version number as a int to deal with minor versions with single digits
-        /// </summary>
-        /// <param name="ver"></param>
-        /// <returns></returns>
-        public static Version AsFullVersion(this string ver)
-        {
-            return new Version(ver);
-        }
-        
-        public static string GetFieldValue(this YouTrackIssue issue, string fieldName)
-        {
-            var findField = issue.Field.FirstOrDefault(x => x.Name == fieldName);
-            return findField != null ? findField.Value.ToString().Replace("[", string.Empty).Replace("]", string.Empty).Replace("\"", string.Empty).Trim() : string.Empty;
-        }
-
-        public static DateTime ConvertFromUnixDate(this long date)
-        {
-            return new DateTime(1970, 1, 1).AddMilliseconds(date);
-        }
-
-        public static string StateIcon(this IssueView issue)
-        {
-            switch (issue.state.ToLowerInvariant().Replace(" ", "").Replace("'", ""))
-            {
-                case "submitted":
-                    return "icon-Checkbox-dotted";
-                case "open":
-                    return "icon-Checkbox-empty";
-                case "inprogress":
-                    return "icon-Paper-plane-alt";
-                case "fixed":
-                    return "icon-Check";
-                case "duplicate":
-                    return "icon-Multiple-windows";
-                case "cantreproduce":
-                    return "icon-Enter";
-                case "obsolete":
-                    return "icon-Scull";
-                case "closed":
-                    return "icon-Stop-alt";
-                case "reopened":
-                    return "icon-Undo";
-                case "workaroundposted":
-                    return "icon-Redo";
-                case "resolved":
-                    return "icon-Check";
-                default:
-                    return "";
-            }
-        }
-    }
+using System;
+using System.Linq;
+using OurUmbraco.Release.Models;
+
+namespace OurUmbraco.Release
+{
+    public static class Extensions
+    {
+        public static DateTime JavaTimeStampToDateTime(double javaTimeStamp)
+        {
+            // Java timestamp is millisecods past epoch
+            var dtDateTime = new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            dtDateTime = dtDateTime.AddSeconds(Math.Round(javaTimeStamp / 1000)).ToLocalTime();
+            return dtDateTime;
+        }
+        
+        /// <summary>
+        /// Return the version number as a int to deal with minor versions with single digits
+        /// </summary>
+        /// <param name="ver"></param>
+        /// <returns></returns>
+        public static System.Version AsFullVersion(this string ver)
+        {
+            return new System.Version(ver);
+        }
+        
+        public static string GetFieldValue(this YouTrackIssue issue, string fieldName)
+        {
+            var findField = issue.Field.FirstOrDefault(x => x.Name == fieldName);
+            return findField != null ? findField.Value.ToString().Replace("[", string.Empty).Replace("]", string.Empty).Replace("\"", string.Empty).Trim() : string.Empty;
+        }
+
+        public static DateTime ConvertFromUnixDate(this long date)
+        {
+            return new DateTime(1970, 1, 1).AddMilliseconds(date);
+        }
+
+        public static string StateIcon(this IssueView issue)
+        {
+            switch (issue.state.ToLowerInvariant().Replace(" ", "").Replace("'", ""))
+            {
+                case "submitted":
+                    return "icon-Checkbox-dotted";
+                case "open":
+                    return "icon-Checkbox-empty";
+                case "inprogress":
+                    return "icon-Paper-plane-alt";
+                case "fixed":
+                    return "icon-Check";
+                case "duplicate":
+                    return "icon-Multiple-windows";
+                case "cantreproduce":
+                    return "icon-Enter";
+                case "obsolete":
+                    return "icon-Scull";
+                case "closed":
+                    return "icon-Stop-alt";
+                case "reopened":
+                    return "icon-Undo";
+                case "workaroundposted":
+                    return "icon-Redo";
+                case "resolved":
+                    return "icon-Check";
+                default:
+                    return "";
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/uRelease/Import.cs b/OurUmbraco/Release/Import.cs
similarity index 96%
rename from uRelease/Import.cs
rename to OurUmbraco/Release/Import.cs
index 6ba3ebd8..aad22988 100644
--- a/uRelease/Import.cs
+++ b/OurUmbraco/Release/Import.cs
@@ -8,21 +8,18 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Mail;
-using System.Threading.Tasks;
 using System.Web;
 using System.Web.Hosting;
 using System.Web.Mvc;
 using System.Web.Script.Serialization;
 using Newtonsoft.Json;
+using OurUmbraco.Release.Models;
 using RestSharp;
 using umbraco.NodeFactory;
-using uRelease.Controllers;
-using uRelease.Models;
 using Umbraco.Core.Logging;
 using YouTrackSharp.Infrastructure;
-using Version = uRelease.Models.Version;
 
-namespace uRelease
+namespace OurUmbraco.Release
 {
     public class Import
     {
@@ -45,7 +42,7 @@ namespace uRelease
             // For each version in the bundle, go get the issues 
             var toReturn = new List<AggregateView>();
 
-            Version[] orderedVersions;
+            Models.Version[] orderedVersions;
 
             if (cached == false)
             {
@@ -57,12 +54,12 @@ namespace uRelease
             }
             else
             {
-                orderedVersions = ids.Split(',').Select(versionId => new Version { Value = versionId }).ToArray();
+                orderedVersions = ids.Split(',').Select(versionId => new Models.Version { Value = versionId }).ToArray();
             }
 
-            var currentReleases = new List<Version>();
-            var plannedReleases = new List<Version>();
-            var inProgressReleases = new List<Version>();
+            var currentReleases = new List<Models.Version>();
+            var plannedReleases = new List<Models.Version>();
+            var inProgressReleases = new List<Models.Version>();
 
             var releasesNode = new Node(_releasesPageNodeId);
 
diff --git a/uRelease/Models/AggregateView.cs b/OurUmbraco/Release/Models/AggregateView.cs
similarity index 92%
rename from uRelease/Models/AggregateView.cs
rename to OurUmbraco/Release/Models/AggregateView.cs
index 19cb717a..603c7dd6 100644
--- a/uRelease/Models/AggregateView.cs
+++ b/OurUmbraco/Release/Models/AggregateView.cs
@@ -1,122 +1,119 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace uRelease.Models
-{
-    using System.Diagnostics;
-
-    public class AggregateView
-    {
-        public string version { get; set; }
-
-        public bool released { get; set; }
-
-        public bool latestRelease { get; set; }
-
-        public bool inProgressRelease { get; set; }
-
-        public bool isPatch { get; set; }
-
-        public string releaseDate { get; set; }
-
-        public string releaseStatus { get; set; }
-
-        public string releaseDescription { get; set; }
-
-        public IEnumerable<IssueView> issues { get; set; }
-
-        public IEnumerable<ActivityView> activities { get; set; }
-
-        public bool currentRelease { get; set; }
-
-        public bool plannedRelease { get; set; }
-    }
-
-    public class IssuesWrapper
-    {
-        public List<Issue> Issues { get; set; }
-    }
-
-    [DebuggerDisplay("Issue: {Id}")]
-    public class Issue
-    {
-        public string Id { get; set; }
-        //public string Id { get; set; }
-
-        //public List<Field> Field { get; set; }
-        public List<Field> Fields { get; set; }
-    }
-
-    [DebuggerDisplay("Field: {Name} {Value}")]
-    public class Field
-    {
-        public string Name { get; set; }
-        public string Value { get; set; }
-    }
-
-    public class Changes : List<Change>
-    {
-        //public List<Change> Change { get; set; }
-        public Issue Issue { get; set; }
-    }
-
-    public class Change
-    {
-        public List<Field> Fields { get; set; }
-
-        //public string Name { get; set; }
-        //public string Value { get; set; }
-        //public string NewValue { get; set; }
-        //public string OldValue { get; set; }
-        //public List<ChangedField> Fields { get; set; }
-
-        public class Field
-        {
-            public string name { get; set; }
-            public string Name { get; set; }
-            public string Value { get; set; }
-            public string NewValue { get; set; }
-            public string OldValue { get; set; }
-        }
-    }
-
-
-
-    public class IssueView
-    {
-        public string id { get; set; }
-
-        public string title { get; set; }
-
-        public string state { get; set; }
-
-        public string type { get; set; }
-
-        public Boolean breaking { get; set; }
-
-    }
-
-    public class ActivityView
-    {
-        /// <summary>
-        /// Gets or sets the issue id for the activity
-        /// </summary>
-        /// <value>The id.</value>
-        public string id { get; set; }
-
-        public string username { get; set; }
-
-        public long date { get; set; }
-
-        public IEnumerable<ChangeView> changes { get; set; }
-    }
-
-    public class ChangeView
-    {
-        public string fieldName { get; set; }
-        public string oldValue { get; set; }
-        public string newValue { get; set; }
-    }
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace OurUmbraco.Release.Models
+{
+    public class AggregateView
+    {
+        public string version { get; set; }
+
+        public bool released { get; set; }
+
+        public bool latestRelease { get; set; }
+
+        public bool inProgressRelease { get; set; }
+
+        public bool isPatch { get; set; }
+
+        public string releaseDate { get; set; }
+
+        public string releaseStatus { get; set; }
+
+        public string releaseDescription { get; set; }
+
+        public IEnumerable<IssueView> issues { get; set; }
+
+        public IEnumerable<ActivityView> activities { get; set; }
+
+        public bool currentRelease { get; set; }
+
+        public bool plannedRelease { get; set; }
+    }
+
+    public class IssuesWrapper
+    {
+        public List<Issue> Issues { get; set; }
+    }
+
+    [DebuggerDisplay("Issue: {Id}")]
+    public class Issue
+    {
+        public string Id { get; set; }
+        //public string Id { get; set; }
+
+        //public List<Field> Field { get; set; }
+        public List<Field> Fields { get; set; }
+    }
+
+    [DebuggerDisplay("Field: {Name} {Value}")]
+    public class Field
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+    }
+
+    public class Changes : List<Change>
+    {
+        //public List<Change> Change { get; set; }
+        public Issue Issue { get; set; }
+    }
+
+    public class Change
+    {
+        public List<Field> Fields { get; set; }
+
+        //public string Name { get; set; }
+        //public string Value { get; set; }
+        //public string NewValue { get; set; }
+        //public string OldValue { get; set; }
+        //public List<ChangedField> Fields { get; set; }
+
+        public class Field
+        {
+            public string name { get; set; }
+            public string Name { get; set; }
+            public string Value { get; set; }
+            public string NewValue { get; set; }
+            public string OldValue { get; set; }
+        }
+    }
+
+
+
+    public class IssueView
+    {
+        public string id { get; set; }
+
+        public string title { get; set; }
+
+        public string state { get; set; }
+
+        public string type { get; set; }
+
+        public Boolean breaking { get; set; }
+
+    }
+
+    public class ActivityView
+    {
+        /// <summary>
+        /// Gets or sets the issue id for the activity
+        /// </summary>
+        /// <value>The id.</value>
+        public string id { get; set; }
+
+        public string username { get; set; }
+
+        public long date { get; set; }
+
+        public IEnumerable<ChangeView> changes { get; set; }
+    }
+
+    public class ChangeView
+    {
+        public string fieldName { get; set; }
+        public string oldValue { get; set; }
+        public string newValue { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/uRelease/Models/Comment.cs b/OurUmbraco/Release/Models/Comment.cs
similarity index 94%
rename from uRelease/Models/Comment.cs
rename to OurUmbraco/Release/Models/Comment.cs
index bf199467..bfc522cc 100644
--- a/uRelease/Models/Comment.cs
+++ b/OurUmbraco/Release/Models/Comment.cs
@@ -1,4 +1,4 @@
-namespace uRelease.Models
+namespace OurUmbraco.Release.Models
 {
     public class Comment
     {
diff --git a/uRelease/Models/Version.cs b/OurUmbraco/Release/Models/Version.cs
similarity index 92%
rename from uRelease/Models/Version.cs
rename to OurUmbraco/Release/Models/Version.cs
index 961352e9..e1342ef0 100644
--- a/uRelease/Models/Version.cs
+++ b/OurUmbraco/Release/Models/Version.cs
@@ -1,41 +1,41 @@
-using System;
-using System.Collections.Generic;
-
-namespace uRelease.Models
-{
-    public class Version
-    {
-        public bool Released { get; set; }
-
-        public bool Archived { get; set; }
-
-        public bool LatestRelease { get; set; }
-
-        public bool InProgressRelease { get; set; }
-
-        public long ReleaseDate { get; set; }
-
-        public string Description { get; set; }
-
-        public DateTime GetReleaseDate()
-        {
-            return Extensions.JavaTimeStampToDateTime(ReleaseDate);
-        }
-
-        public string Value { get; set; }
-
-        public string ReleaseStatus { get; set; }
-    }
-
-    public class CustomField
-    {
-        public string bundle { get; set; }
-    }
-
-    public class VersionBundle
-    {
-        public string Name { get; set; }
-
-        public List<Version> Versions { get; set; }
-    }
+using System;
+using System.Collections.Generic;
+
+namespace OurUmbraco.Release.Models
+{
+    public class Version
+    {
+        public bool Released { get; set; }
+
+        public bool Archived { get; set; }
+
+        public bool LatestRelease { get; set; }
+
+        public bool InProgressRelease { get; set; }
+
+        public long ReleaseDate { get; set; }
+
+        public string Description { get; set; }
+
+        public DateTime GetReleaseDate()
+        {
+            return Extensions.JavaTimeStampToDateTime(ReleaseDate);
+        }
+
+        public string Value { get; set; }
+
+        public string ReleaseStatus { get; set; }
+    }
+
+    public class CustomField
+    {
+        public string bundle { get; set; }
+    }
+
+    public class VersionBundle
+    {
+        public string Name { get; set; }
+
+        public List<Version> Versions { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/uRelease/Models/YouTrackComment.cs b/OurUmbraco/Release/Models/YouTrackComment.cs
similarity index 94%
rename from uRelease/Models/YouTrackComment.cs
rename to OurUmbraco/Release/Models/YouTrackComment.cs
index bd08b397..3eefca78 100644
--- a/uRelease/Models/YouTrackComment.cs
+++ b/OurUmbraco/Release/Models/YouTrackComment.cs
@@ -1,4 +1,4 @@
-namespace uRelease.Models
+namespace OurUmbraco.Release.Models
 {
     public class YouTrackComment
     {
diff --git a/uRelease/Models/YouTrackField.cs b/OurUmbraco/Release/Models/YouTrackField.cs
similarity index 78%
rename from uRelease/Models/YouTrackField.cs
rename to OurUmbraco/Release/Models/YouTrackField.cs
index 5737568d..08c54813 100644
--- a/uRelease/Models/YouTrackField.cs
+++ b/OurUmbraco/Release/Models/YouTrackField.cs
@@ -1,4 +1,4 @@
-namespace uRelease.Models
+namespace OurUmbraco.Release.Models
 {
     public class YouTrackField
     {
diff --git a/uRelease/Models/YouTrackIssue.cs b/OurUmbraco/Release/Models/YouTrackIssue.cs
similarity index 89%
rename from uRelease/Models/YouTrackIssue.cs
rename to OurUmbraco/Release/Models/YouTrackIssue.cs
index a76dff24..e67b1f37 100644
--- a/uRelease/Models/YouTrackIssue.cs
+++ b/OurUmbraco/Release/Models/YouTrackIssue.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace uRelease.Models
+namespace OurUmbraco.Release.Models
 {
     public class YouTrackIssue
     {
diff --git a/uRelease/Release.cs b/OurUmbraco/Release/Release.cs
similarity index 91%
rename from uRelease/Release.cs
rename to OurUmbraco/Release/Release.cs
index 7d782afa..4c84c08e 100644
--- a/uRelease/Release.cs
+++ b/OurUmbraco/Release/Release.cs
@@ -2,9 +2,9 @@
 using System.IO;
 using System.Web;
 using System.Web.Script.Serialization;
-using uRelease.Models;
+using OurUmbraco.Release.Models;
 
-namespace uRelease
+namespace OurUmbraco.Release
 {
     public class Release
     {
diff --git a/uRelease/Roadmap.cs b/OurUmbraco/Release/Roadmap.cs
similarity index 92%
rename from uRelease/Roadmap.cs
rename to OurUmbraco/Release/Roadmap.cs
index 875a1a72..8884821d 100644
--- a/uRelease/Roadmap.cs
+++ b/OurUmbraco/Release/Roadmap.cs
@@ -3,9 +3,9 @@ using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Script.Serialization;
-using uRelease.Models;
+using OurUmbraco.Release.Models;
 
-namespace uRelease
+namespace OurUmbraco.Release
 {
     public static class Roadmap
     {
diff --git a/uRelease/Versions.cs b/OurUmbraco/Release/Versions.cs
similarity index 88%
rename from uRelease/Versions.cs
rename to OurUmbraco/Release/Versions.cs
index b644e63d..a01c471f 100644
--- a/uRelease/Versions.cs
+++ b/OurUmbraco/Release/Versions.cs
@@ -2,9 +2,9 @@
 using System.IO;
 using System.Web.Hosting;
 using System.Web.Script.Serialization;
-using uRelease.Models;
+using OurUmbraco.Release.Models;
 
-namespace uRelease
+namespace OurUmbraco.Release
 {
     public class Versions
     {
diff --git a/OurUmbraco/packages.config b/OurUmbraco/packages.config
index d324eece..48ebecd5 100644
--- a/OurUmbraco/packages.config
+++ b/OurUmbraco/packages.config
@@ -3,10 +3,12 @@
   <package id="AutoMapper" version="3.0.0" targetFramework="net451" />
   <package id="ClientDependency" version="1.8.4" targetFramework="net451" />
   <package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net451" />
+  <package id="EasyHttp" version="1.6.29.0" targetFramework="net451" />
   <package id="Examine" version="0.1.65.0" targetFramework="net451" />
   <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net451" />
   <package id="ImageProcessor" version="2.2.7.0" targetFramework="net451" />
   <package id="ImageProcessor.Web" version="4.3.5.0" targetFramework="net451" />
+  <package id="JsonFx" version="2.0.1209.2802" targetFramework="net451" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net451" />
   <package id="MarkdownDeep.NET" version="1.5" targetFramework="net451" />
   <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net451" />
@@ -26,4 +28,5 @@
   <package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
   <package id="UmbracoCms.Core" version="7.2.8-build103" targetFramework="net451" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net451" />
+  <package id="YouTrackSharp" version="2.0.11.0" targetFramework="net451" />
 </packages>
\ No newline at end of file
diff --git a/our.umbraco.org.sln b/our.umbraco.org.sln
index afdd1f20..518c10a3 100644
--- a/our.umbraco.org.sln
+++ b/our.umbraco.org.sln
@@ -26,8 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F3A30E
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uRelease", "uRelease\uRelease.csproj", "{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uProject", "Marketplace\uProject.csproj", "{6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OurUmbraco", "OurUmbraco\OurUmbraco.csproj", "{A8E5C936-ECAB-45B3-BFDA-D12F680EB2A6}"
@@ -92,16 +90,6 @@ Global
 		{6CF53D68-BD81-47BB-8F56-350A1B04F114}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6CF53D68-BD81-47BB-8F56-350A1B04F114}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6CF53D68-BD81-47BB-8F56-350A1B04F114}.Release|x86.ActiveCfg = Release|Any CPU
-		{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}.Release|x86.ActiveCfg = Release|Any CPU
 		{6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
diff --git a/our.umbraco.org/Scheduling/YouTrackSync.cs b/our.umbraco.org/Scheduling/YouTrackSync.cs
index 766b2e4e..86a672c9 100644
--- a/our.umbraco.org/Scheduling/YouTrackSync.cs
+++ b/our.umbraco.org/Scheduling/YouTrackSync.cs
@@ -1,5 +1,5 @@
 using System;
-using uRelease;
+using OurUmbraco.Release;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 
diff --git a/our.umbraco.org/our.umbraco.org.csproj b/our.umbraco.org/our.umbraco.org.csproj
index a4df635e..ccabdb4b 100644
--- a/our.umbraco.org/our.umbraco.org.csproj
+++ b/our.umbraco.org/our.umbraco.org.csproj
@@ -426,10 +426,6 @@
       <Project>{547C2D0D-1B55-493B-AE0B-E031A5B8EE77}</Project>
       <Name>uForum</Name>
     </ProjectReference>
-    <ProjectReference Include="..\uRelease\uRelease.csproj">
-      <Project>{c5b74e6a-abce-4a9a-896d-89c33fdafcd8}</Project>
-      <Name>uRelease</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="usercontrols\EventEditor.ascx">
diff --git a/uRelease/uRelease.csproj b/uRelease/uRelease.csproj
index 1dd1b897..1eb0532a 100644
--- a/uRelease/uRelease.csproj
+++ b/uRelease/uRelease.csproj
@@ -246,21 +246,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="App_Start\ControllerRouting.cs" />
-    <Compile Include="Download.cs" />
-    <Compile Include="Controllers\NodeExtensions.cs" />
-    <Compile Include="Extensions.cs" />
-    <Compile Include="Import.cs" />
-    <Compile Include="Models\AggregateView.cs" />
-    <Compile Include="Models\Comment.cs" />
-    <Compile Include="Models\Version.cs" />
-    <Compile Include="Models\YouTrackComment.cs" />
-    <Compile Include="Models\YouTrackField.cs" />
-    <Compile Include="Models\YouTrackIssue.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Release.cs" />
-    <Compile Include="Roadmap.cs" />
-    <Compile Include="Versions.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />