From 81aec9d30af3a5c099d2a6d5e6176c2b243c3fa8 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sun, 26 Jul 2015 20:31:59 +0200
Subject: [PATCH] Adjust uForum namespaces to be correct

---
 OurUmbraco.Site/Hiccup.aspx                        |  2 +-
 .../Views/MacroPartials/Global/AlertBar.cshtml     |  1 -
 .../Views/MacroPartials/Members/Profile.cshtml     |  4 ++--
 .../Views/MacroPartials/Members/QuickMenu.cshtml   |  1 -
 .../Views/MacroPartials/Members/Register.cshtml    |  1 +
 .../MacroPartials/Navigation/TopNavigation.cshtml  |  1 -
 .../MacroPartials/Projects/ListProjects.cshtml     |  2 +-
 .../MacroPartials/Projects/ProjectDetails.cshtml   |  1 -
 .../MacroPartials/Search/GlobalSearchPage.cshtml   |  3 ++-
 .../Views/MacroPartials/Spam/Overview.cshtml       |  3 +--
 .../Views/Partials/Members/Profile.cshtml          |  5 +++--
 .../Partials/Members/ProfileNotification.cshtml    |  5 +++--
 .../Views/Partials/Members/Register.cshtml         |  5 +++--
 OurUmbraco.Site/Views/Search/Search.aspx           |  2 +-
 OurUmbraco.Site/Views/Search/Search.aspx.cs        |  4 ++--
 OurUmbraco.Site/config/ExamineSettings.config      | 10 +++++-----
 OurUmbraco.Site/masterpages/Master.master          |  2 +-
 OurUmbraco.Site/masterpages/Release.master         |  2 +-
 .../usercontrols/our.umbraco.org/EventEditor.ascx  |  2 +-
 .../our.umbraco.org/FileDownloadProxy.ascx         |  2 +-
 .../our.umbraco.org/Forgotpassword.ascx            |  2 +-
 .../usercontrols/our.umbraco.org/InsertImage.ascx  |  2 +-
 .../usercontrols/our.umbraco.org/Login.ascx        |  2 +-
 .../our.umbraco.org/ProjectCollabRequest.ascx      |  2 +-
 .../our.umbraco.org/ProjectContributors.ascx       |  2 +-
 .../our.umbraco.org/ProjectEditor.ascx             |  2 +-
 .../our.umbraco.org/ProjectFileUpload.ascx         |  2 +-
 .../our.umbraco.org/ProjectForums.ascx             |  2 +-
 .../usercontrols/our.umbraco.org/Signup.ascx       |  2 +-
 .../usercontrols/our.umbraco.org/SignupSimple.ascx |  2 +-
 .../usercontrols/our.umbraco.org/acceptTos.ascx    |  2 +-
 OurUmbraco/Our/Api/CommunityController.cs          | 11 +++++------
 OurUmbraco/Our/Api/SearchController.cs             | 14 ++++----------
 OurUmbraco/Our/Businesslogic/ProjectContributor.cs |  8 +-------
 OurUmbraco/Our/Controllers/AvatarController.cs     |  3 +--
 OurUmbraco/Our/Controllers/LoginController.cs      |  9 ++-------
 OurUmbraco/Our/Controllers/ProfileController.cs    | 13 +++----------
 .../Controllers/ProfileNotificationController.cs   | 11 +++--------
 OurUmbraco/Our/Controllers/RegisterController.cs   | 11 +++--------
 OurUmbraco/Our/CustomHandlers/CommentVote.cs       |  3 +--
 OurUmbraco/Our/CustomHandlers/ExternalVote.cs      |  2 +-
 OurUmbraco/Our/CustomHandlers/ForumIndexer.cs      |  5 +++--
 OurUmbraco/Our/CustomHandlers/ForumPostsCounter.cs |  2 +-
 .../CustomHandlers/OurApplicationStartupHandler.cs | 11 +++--------
 OurUmbraco/Our/CustomHandlers/ProjectIndexer.cs    |  5 ++---
 OurUmbraco/Our/CustomHandlers/ProjectVote.cs       |  3 +--
 .../Our/CustomHandlers/ProjectsEnsureGuid.cs       |  3 +--
 .../Our/CustomHandlers/SearchPageRouteHandler.cs   |  2 +-
 OurUmbraco/Our/CustomHandlers/TopicVote.cs         |  3 +--
 OurUmbraco/Our/CustomHandlers/memberSave.cs        |  2 +-
 OurUmbraco/Our/DefaultMemberAvatarHandler.cs       |  7 ++-----
 OurUmbraco/Our/Examine/DocumentationIndexConfig.cs |  2 +-
 .../Our/Examine/DocumentationIndexDataService.cs   |  6 ++----
 OurUmbraco/Our/Examine/ExamineHelper.cs            |  3 +--
 OurUmbraco/Our/Examine/ForumDataService.cs         | 13 +++++--------
 OurUmbraco/Our/Examine/OurSearcher.cs              |  4 ++--
 OurUmbraco/Our/Examine/ProjectAnalyzer.cs          |  2 +-
 .../Our/Examine/ProjectNodeIndexDataService.cs     |  9 ++-------
 OurUmbraco/Our/Examine/SearchFilter.cs             |  2 +-
 OurUmbraco/Our/Examine/SearchFilters.cs            |  2 +-
 OurUmbraco/Our/Examine/VersionAnalyzer.cs          |  2 +-
 OurUmbraco/Our/Examine/VersionTokenizer.cs         |  2 +-
 OurUmbraco/Our/HackedCdfLoader.cs                  |  2 +-
 OurUmbraco/Our/Hiccup.cs                           |  2 +-
 OurUmbraco/Our/MigrationsHandler.cs                |  2 +-
 OurUmbraco/Our/Models/ProfileModel.cs              |  9 ++-------
 OurUmbraco/Our/Models/ProfileNotificationModel.cs  |  9 ++-------
 OurUmbraco/Our/Models/RegisterModel.cs             |  9 ++-------
 OurUmbraco/Our/Models/SearchResultContentModel.cs  |  9 ++-------
 OurUmbraco/Our/Models/SearchResultModel.cs         |  2 +-
 OurUmbraco/Our/ProjectFileUploadHandler.cs         |  7 ++-----
 OurUmbraco/Our/Rest.cs                             |  3 +--
 OurUmbraco/Our/Scheduling/Scheduler.cs             |  3 +--
 OurUmbraco/Our/Scheduling/YouTrackSync.cs          |  2 +-
 OurUmbraco/Our/SearchResultExtensions.cs           |  2 +-
 OurUmbraco/Our/controls/DateTimePicker.cs          |  2 +-
 OurUmbraco/Our/usercontrols/EventEditor.ascx       |  2 +-
 OurUmbraco/Our/usercontrols/EventEditor.ascx.cs    |  9 ++++-----
 .../Our/usercontrols/EventEditor.ascx.designer.cs  |  2 +-
 OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx |  2 +-
 .../Our/usercontrols/FileDownloadProxy.ascx.cs     |  8 +-------
 .../FileDownloadProxy.ascx.designer.cs             | 13 +++++--------
 OurUmbraco/Our/usercontrols/Forgotpassword.ascx    |  2 +-
 OurUmbraco/Our/usercontrols/Forgotpassword.ascx.cs |  2 +-
 .../usercontrols/Forgotpassword.ascx.designer.cs   |  2 +-
 OurUmbraco/Our/usercontrols/InsertImage.ascx       |  2 +-
 OurUmbraco/Our/usercontrols/InsertImage.ascx.cs    |  5 ++---
 .../Our/usercontrols/InsertImage.ascx.designer.cs  |  2 +-
 OurUmbraco/Our/usercontrols/Login.ascx             |  2 +-
 OurUmbraco/Our/usercontrols/Login.ascx.cs          |  2 +-
 OurUmbraco/Our/usercontrols/Login.ascx.designer.cs |  2 +-
 .../Our/usercontrols/ProjectCollabRequest.ascx     |  2 +-
 .../Our/usercontrols/ProjectCollabRequest.ascx.cs  |  9 ++-------
 .../ProjectCollabRequest.ascx.designer.cs          |  2 +-
 .../Our/usercontrols/ProjectContributors.ascx      |  2 +-
 .../Our/usercontrols/ProjectContributors.ascx.cs   |  9 ++-------
 .../ProjectContributors.ascx.designer.cs           |  2 +-
 OurUmbraco/Our/usercontrols/ProjectEditor.ascx     |  2 +-
 OurUmbraco/Our/usercontrols/ProjectEditor.ascx.cs  |  5 ++---
 .../usercontrols/ProjectEditor.ascx.designer.cs    |  2 +-
 OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx |  2 +-
 .../Our/usercontrols/ProjectFileUpload.ascx.cs     |  7 +------
 .../ProjectFileUpload.ascx.designer.cs             |  2 +-
 OurUmbraco/Our/usercontrols/ProjectForums.ascx     |  2 +-
 OurUmbraco/Our/usercontrols/ProjectForums.ascx.cs  | 13 ++++---------
 .../usercontrols/ProjectForums.ascx.designer.cs    |  5 ++---
 OurUmbraco/Our/usercontrols/Signup.ascx            |  2 +-
 OurUmbraco/Our/usercontrols/Signup.ascx.cs         |  2 +-
 .../Our/usercontrols/Signup.ascx.designer.cs       |  2 +-
 OurUmbraco/Our/usercontrols/SignupSimple.ascx      |  2 +-
 OurUmbraco/Our/usercontrols/SignupSimple.ascx.cs   |  7 +------
 .../Our/usercontrols/SignupSimple.ascx.designer.cs |  2 +-
 OurUmbraco/Our/usercontrols/acceptTos.ascx         |  2 +-
 OurUmbraco/Our/usercontrols/acceptTos.ascx.cs      |  7 +------
 .../Our/usercontrols/acceptTos.ascx.designer.cs    |  2 +-
 115 files changed, 171 insertions(+), 298 deletions(-)

diff --git a/OurUmbraco.Site/Hiccup.aspx b/OurUmbraco.Site/Hiccup.aspx
index d84174ba..d5020038 100644
--- a/OurUmbraco.Site/Hiccup.aspx
+++ b/OurUmbraco.Site/Hiccup.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Hiccup.aspx.cs" Inherits="our.Hiccup" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Hiccup.aspx.cs" Inherits="OurUmbraco.Our.Hiccup" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" >
diff --git a/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml b/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml
index 776c2086..db53ade5 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Global/AlertBar.cshtml
@@ -1,5 +1,4 @@
 @using System.Drawing
-@using our
 @using OurUmbraco.Our
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @{
diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/Profile.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/Profile.cshtml
index 732e818d..d484ee29 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Members/Profile.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Members/Profile.cshtml
@@ -1,3 +1,3 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
-	
-	@Html.Action("Render", "Profile") 
+
+@Html.Action("Render", "Profile") 
diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml
index ff5962c7..70e578c7 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml
@@ -1,6 +1,5 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @using System.Drawing
-@using our
 @using OurUmbraco.Forum.Extensions
 @using OurUmbraco.Forum.Services
 @using OurUmbraco.Our
diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/Register.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/Register.cshtml
index cbb709bc..0263dfc1 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Members/Register.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Members/Register.cshtml
@@ -6,4 +6,5 @@
         Response.Redirect("/member/profile");
     }
 }
+
 @Html.Action("Render", "Register") 
\ No newline at end of file
diff --git a/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml b/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml
index 985ee56b..eb0c9fb3 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Navigation/TopNavigation.cshtml
@@ -1,6 +1,5 @@
 @using System.Collections.Specialized
 @using System.Drawing
-@using our
 @using OurUmbraco.Our
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
diff --git a/OurUmbraco.Site/Views/MacroPartials/Projects/ListProjects.cshtml b/OurUmbraco.Site/Views/MacroPartials/Projects/ListProjects.cshtml
index 7b7ddd56..841f066c 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Projects/ListProjects.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Projects/ListProjects.cshtml
@@ -1,6 +1,6 @@
 @using Examine.SearchCriteria
-@using our.Examine
 @using OurUmbraco.Our
+@using OurUmbraco.Our.Examine
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @{
     const int pagesToShowLeft = 4;
diff --git a/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml b/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml
index 4fe88458..cd6a38ef 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml
@@ -1,5 +1,4 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
-@using our.Controllers
 @using OurUmbraco.Forum.Extensions
 @using OurUmbraco.Our
 @using OurUmbraco.Project.Services
diff --git a/OurUmbraco.Site/Views/MacroPartials/Search/GlobalSearchPage.cshtml b/OurUmbraco.Site/Views/MacroPartials/Search/GlobalSearchPage.cshtml
index 1e8498fa..1ca72016 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Search/GlobalSearchPage.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Search/GlobalSearchPage.cshtml
@@ -1,3 +1,4 @@
+@using OurUmbraco.Our.Examine
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @{
@@ -8,7 +9,7 @@
     var term = Request["term"];
     var pageSize = 50;
 
-    our.Examine.OurSearcher searcher = new our.Examine.OurSearcher(term, orderBy: orderMode);
+    OurSearcher searcher = new OurSearcher(term, orderBy: orderMode);
     
     IEnumerable<SearchResult> result = new List<SearchResult>();
     var url = "orderBy=" + orderMode + "&q=" + term + "&version=" + version;
diff --git a/OurUmbraco.Site/Views/MacroPartials/Spam/Overview.cshtml b/OurUmbraco.Site/Views/MacroPartials/Spam/Overview.cshtml
index 0db2e520..4a5ea9fc 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Spam/Overview.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Spam/Overview.cshtml
@@ -1,5 +1,4 @@
-@using our
-@using OurUmbraco.Forum.Extensions
+@using OurUmbraco.Forum.Extensions
 @using OurUmbraco.Forum.Services
 @using OurUmbraco.Our
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
diff --git a/OurUmbraco.Site/Views/Partials/Members/Profile.cshtml b/OurUmbraco.Site/Views/Partials/Members/Profile.cshtml
index a4dceee4..879fda55 100644
--- a/OurUmbraco.Site/Views/Partials/Members/Profile.cshtml
+++ b/OurUmbraco.Site/Views/Partials/Members/Profile.cshtml
@@ -1,4 +1,5 @@
-@inherits Umbraco.Web.Mvc.UmbracoViewPage<our.Models.ProfileModel>
+@using OurUmbraco.Our.Controllers
+@inherits Umbraco.Web.Mvc.UmbracoViewPage<OurUmbraco.Our.Models.ProfileModel>
 @{
     Html.EnableClientValidation(true);
     Html.EnableUnobtrusiveJavaScript(true);
@@ -21,7 +22,7 @@
         <strong>Change your profile</strong>
         <div class="profile-settings-forms">
 
-            @using (Html.BeginUmbracoForm<our.Controllers.ProfileController>("HandleSubmit"))
+            @using (Html.BeginUmbracoForm<ProfileController>("HandleSubmit"))
             {
                 @Html.ValidationSummary()
                 @Html.AntiForgeryToken()
diff --git a/OurUmbraco.Site/Views/Partials/Members/ProfileNotification.cshtml b/OurUmbraco.Site/Views/Partials/Members/ProfileNotification.cshtml
index 82e832fa..7cf44644 100644
--- a/OurUmbraco.Site/Views/Partials/Members/ProfileNotification.cshtml
+++ b/OurUmbraco.Site/Views/Partials/Members/ProfileNotification.cshtml
@@ -1,4 +1,5 @@
-@inherits Umbraco.Web.Mvc.UmbracoViewPage<our.Models.ProfileNotificationModel>
+@using OurUmbraco.Our.Controllers
+@inherits Umbraco.Web.Mvc.UmbracoViewPage<OurUmbraco.Our.Models.ProfileNotificationModel>
 @{
     Html.EnableClientValidation(true);
     Html.EnableUnobtrusiveJavaScript(true);
@@ -9,7 +10,7 @@
     
     <div class="profile-settings-forms">
 
-        @using (Html.BeginUmbracoForm<our.Controllers.ProfileNotificationController>("HandleSubmit"))
+        @using (Html.BeginUmbracoForm<ProfileNotificationController>("HandleSubmit"))
         {
             @Html.AntiForgeryToken()
 
diff --git a/OurUmbraco.Site/Views/Partials/Members/Register.cshtml b/OurUmbraco.Site/Views/Partials/Members/Register.cshtml
index a6769fa3..24797937 100644
--- a/OurUmbraco.Site/Views/Partials/Members/Register.cshtml
+++ b/OurUmbraco.Site/Views/Partials/Members/Register.cshtml
@@ -1,4 +1,5 @@
-@inherits Umbraco.Web.Mvc.UmbracoViewPage<our.Models.RegisterModel>
+@using OurUmbraco.Our.Controllers
+@inherits Umbraco.Web.Mvc.UmbracoViewPage<OurUmbraco.Our.Models.RegisterModel>
 @{
     Html.EnableClientValidation(true);
     Html.EnableUnobtrusiveJavaScript(true);
@@ -21,7 +22,7 @@
     <strong>Your details</strong>
     <div class="profile-settings-forms">
 
-        @using (Html.BeginUmbracoForm<our.Controllers.RegisterController>("HandleSubmit"))
+        @using (Html.BeginUmbracoForm<RegisterController>("HandleSubmit"))
         {
             @Html.ValidationSummary(true)
             @Html.AntiForgeryToken()
diff --git a/OurUmbraco.Site/Views/Search/Search.aspx b/OurUmbraco.Site/Views/Search/Search.aspx
index f045b538..35d5e116 100644
--- a/OurUmbraco.Site/Views/Search/Search.aspx
+++ b/OurUmbraco.Site/Views/Search/Search.aspx
@@ -1,7 +1,7 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" CodeBehind="Search.aspx.cs" Inherits="OurUmbraco.Site.Views.Search.Search" %>
 
 <%@ Import Namespace="Umbraco.Web" %>
-<%@ Import Namespace="our" %>
+<%@ Import Namespace="OurUmbraco.Our" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="Head" runat="server">
 </asp:Content>
diff --git a/OurUmbraco.Site/Views/Search/Search.aspx.cs b/OurUmbraco.Site/Views/Search/Search.aspx.cs
index e8d240aa..1c70e61e 100644
--- a/OurUmbraco.Site/Views/Search/Search.aspx.cs
+++ b/OurUmbraco.Site/Views/Search/Search.aspx.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Examine.SearchCriteria;
-using our.Examine;
-using our.Models;
+using OurUmbraco.Our.Examine;
+using OurUmbraco.Our.Models;
 using Umbraco.Web;
 using Umbraco.Web.UI.Pages;
 
diff --git a/OurUmbraco.Site/config/ExamineSettings.config b/OurUmbraco.Site/config/ExamineSettings.config
index d8a84cea..deb19a32 100644
--- a/OurUmbraco.Site/config/ExamineSettings.config
+++ b/OurUmbraco.Site/config/ExamineSettings.config
@@ -23,21 +23,21 @@ More information and documentation can be found on CodePlex: http://umbracoexami
 
       <add name="ForumIndexer" type="Examine.LuceneEngine.Providers.SimpleDataIndexer, Examine"
            autoOptimize="false"	  
-           dataService="our.Examine.ForumDataService, our.umbraco.org"
+           dataService="OurUmbraco.Our.Examine.ForumDataService, OurUmbraco"
            indexTypes="forum" /> 
 
       <add name="documentationIndexer" type="Examine.LuceneEngine.Providers.SimpleDataIndexer, Examine"
            autoOptimize="false"
            indexSet="documentationIndexSet"
-           dataService="our.Examine.DocumentationIndexDataService, our.umbraco.org"
+           dataService="OurUmbraco.Our.Examine.DocumentationIndexDataService, OurUmbraco"
            analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"
            indexTypes="documentation"/>
  
       <add name="projectIndexer" type="Examine.LuceneEngine.Providers.SimpleDataIndexer, Examine"
            autoOptimize="false"	  
           indexSet="projectIndexSet"
-          dataService="our.Examine.ProjectNodeIndexDataService, our.umbraco.org"
-          analyzer="our.Examine.ProjectAnalyzer, our.umbraco.org"
+          dataService="OurUmbraco.Our.Examine.ProjectNodeIndexDataService, OurUmbraco"
+          analyzer="OurUmbraco.Our.Examine.ProjectAnalyzer, OurUmbraco"
           indexTypes="project"/>
      
     </providers>  
@@ -56,7 +56,7 @@ More information and documentation can be found on CodePlex: http://umbracoexami
       <add name="ForumSearcher" type="Examine.LuceneEngine.Providers.LuceneSearcher, Examine" />
 
       <add name="projectSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
-           analyzer="our.Examine.ProjectAnalyzer, our.umbraco.org"/>
+           analyzer="OurUmbraco.Our.Examine.ProjectAnalyzer, OurUmbraco"/>
 
       <add name="documentationSearcher"
         type="Examine.LuceneEngine.Providers.LuceneSearcher, Examine"
diff --git a/OurUmbraco.Site/masterpages/Master.master b/OurUmbraco.Site/masterpages/Master.master
index 7040b8ea..a4875c25 100644
--- a/OurUmbraco.Site/masterpages/Master.master
+++ b/OurUmbraco.Site/masterpages/Master.master
@@ -2,7 +2,7 @@
 
 <%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="CD" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="CD" Namespace="our" Assembly="our.umbraco.org" %>
+<%@ Register TagPrefix="CD" Namespace="OurUmbraco.Our" Assembly="OurUmbraco" %>
 
 <asp:Content ContentPlaceHolderID="ContentPlaceHolderDefault" runat="server">
     <!doctype html>
diff --git a/OurUmbraco.Site/masterpages/Release.master b/OurUmbraco.Site/masterpages/Release.master
index 3ab7546b..e94eed3c 100644
--- a/OurUmbraco.Site/masterpages/Release.master
+++ b/OurUmbraco.Site/masterpages/Release.master
@@ -182,7 +182,7 @@
 						                    var width = (item.IsLast() && countIsOdd) ? 895 : 380;
 						                    var numberOfDownloads = 0;
 						                    int.TryParse(item.NumberOfDownloads, out numberOfDownloads);
-                                            numberOfDownloads = numberOfDownloads + our.Utils.GetReleaseDownloadCount(item.Id);
+                                            numberOfDownloads = numberOfDownloads + OurUmbraco.Our.Utils.GetReleaseDownloadCount(item.Id);
 							                if(item.Name.Contains("WebPI") == false) 
                                             {
                                                 <div class="release @(item.IsFirst() == false ? "bin" : "zip") col-sm-1">
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/EventEditor.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/EventEditor.ascx
index 4507edab..c997a648 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/EventEditor.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/EventEditor.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EventEditor.ascx.cs" Inherits="our.usercontrols.EventEditor" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EventEditor.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.EventEditor" %>
 <%@ Import Namespace="umbraco.cms.businesslogic.member" %>
 <link rel="stylesheet" media="all" type="text/css" href="/css/ui-lightness/jquery-ui-1.8.16.custom.css" />
 
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx
index 47ca1bc1..aabffe71 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/FileDownloadProxy.ascx
@@ -1 +1 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="FileDownloadProxy.ascx.cs" Inherits="our.usercontrols.FileDownloadProxy" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="FileDownloadProxy.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.FileDownloadProxy" %>
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/Forgotpassword.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/Forgotpassword.ascx
index 5b0c9692..dbdaaf8c 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/Forgotpassword.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/Forgotpassword.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Forgotpassword.ascx.cs" Inherits="our.usercontrols.Forgotpassword" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Forgotpassword.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.Forgotpassword" %>
 <asp:Panel runat="server" ID="message" Visible="False">
     <div class="notice">
         <p style="color: green;">A new password has been sent to the email address: <asp:Literal ID="lt_email" runat="server" /></p>
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/InsertImage.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/InsertImage.ascx
index 361d7ffa..60d80248 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/InsertImage.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/InsertImage.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="InsertImage.ascx.cs"
-    Inherits="our.usercontrols.InsertImage" %>
+    Inherits="OurUmbraco.Our.usercontrols.InsertImage" %>
 
 
 <script type="text/javascript">
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/Login.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/Login.ascx
index a8c5ef9c..70c5ff0a 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/Login.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/Login.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Login.ascx.cs" Inherits="our.usercontrols.Login" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Login.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.Login" %>
 
 <asp:Panel runat="server" DefaultButton="bt_login">
     <div class="form simpleForm" id="registrationForm">
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectCollabRequest.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectCollabRequest.ascx
index 76213c89..862f34cd 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectCollabRequest.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectCollabRequest.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectCollabRequest.ascx.cs" Inherits="our.usercontrols.ProjectCollabRequest" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectCollabRequest.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectCollabRequest" %>
 
 <h1><asp:Literal runat="server" ID="lt_title" Text="Create project"></asp:Literal> collaboration request</h1>
 
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectContributors.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectContributors.ascx
index 0d0a2f86..6b7a8c48 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectContributors.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectContributors.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectContributors.ascx.cs" Inherits="our.usercontrols.ProjectContributors" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectContributors.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectContributors" %>
 
 <asp:Panel ID="holder" runat="server" Visible="false">
 
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectEditor.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectEditor.ascx
index 751ebdf5..122505b6 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectEditor.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectEditor.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectEditor.ascx.cs" Inherits="our.usercontrols.ProjectEditor" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectEditor.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectEditor" %>
 
 <asp:PlaceHolder runat="server" ID="notallowed" Visible="False">
     <h2>Sorry, your account is too new to create projects! If you're human, make sure to <a href="https://umbraco.com/about-us/team">get in touch with us</a> to get this restriction lifted.</h2>
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectFileUpload.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectFileUpload.ascx
index 8507231d..47b11e5c 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectFileUpload.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectFileUpload.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectFileUpload.ascx.cs" Inherits="our.usercontrols.ProjectFileUpload" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectFileUpload.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectFileUpload" %>
 
 
 <asp:PlaceHolder ID="holder" runat="server" Visible="false">
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectForums.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectForums.ascx
index e3a95de6..1322ee15 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectForums.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/ProjectForums.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectForums.ascx.cs" Inherits="our.usercontrols.ProjectForums" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectForums.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectForums" %>
 
 <asp:PlaceHolder ID="holder" runat="server" Visible="false">
 
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/Signup.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/Signup.ascx
index 7ccf6226..09ce89d5 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/Signup.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/Signup.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Signup.ascx.cs" Inherits="our.usercontrols.Signup" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Signup.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.Signup" %>
 
 <asp:panel ID="MemberExists" Visible="False" runat="server">
     <p>There is already an account with this e-mail address! You can <a href="/member/login">login</a> or <a href="/member/forgot-password">reset your password</a>.</p>
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/SignupSimple.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/SignupSimple.ascx
index f3b70304..6b99f0cb 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/SignupSimple.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/SignupSimple.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SignupSimple.ascx.cs" Inherits="our.usercontrols.SignupSimple" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SignupSimple.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.SignupSimple" %>
 
 
 <asp:panel ID="Panel1" runat="server" defaultbutton="bt_submit">
diff --git a/OurUmbraco.Site/usercontrols/our.umbraco.org/acceptTos.ascx b/OurUmbraco.Site/usercontrols/our.umbraco.org/acceptTos.ascx
index 61897308..4fbfe2ac 100644
--- a/OurUmbraco.Site/usercontrols/our.umbraco.org/acceptTos.ascx
+++ b/OurUmbraco.Site/usercontrols/our.umbraco.org/acceptTos.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="acceptTos.ascx.cs" Inherits="our.usercontrols.acceptTos" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="acceptTos.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.acceptTos" %>
 <asp:PlaceHolder ID="error" runat="server" Visible="false">
 <div class="error">You need to accept the ToS!</div>
 </asp:PlaceHolder>
diff --git a/OurUmbraco/Our/Api/CommunityController.cs b/OurUmbraco/Our/Api/CommunityController.cs
index c900ab50..d677e6a6 100644
--- a/OurUmbraco/Our/Api/CommunityController.cs
+++ b/OurUmbraco/Our/Api/CommunityController.cs
@@ -1,21 +1,20 @@
 using System;
 using System.Drawing;
+using System.Dynamic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
+using System.Net.Http;
 using System.Web;
 using System.Web.Http;
 using System.Xml;
-using our.Businesslogic;
+using Newtonsoft.Json;
+using OurUmbraco.Our.Businesslogic;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.member;
 using umbraco.cms.businesslogic.web;
 using Umbraco.Web.WebApi;
-using System.Net.Http;
-using System.Dynamic;
-using Newtonsoft.Json;
 
-namespace our.Api
+namespace OurUmbraco.Our.Api
 {
     public class CommunityController : UmbracoApiController
     {
diff --git a/OurUmbraco/Our/Api/SearchController.cs b/OurUmbraco/Our/Api/SearchController.cs
index 648a124b..54e5c9fd 100644
--- a/OurUmbraco/Our/Api/SearchController.cs
+++ b/OurUmbraco/Our/Api/SearchController.cs
@@ -1,18 +1,12 @@
-using Examine;
-using our.Examine;
-using System;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Examine.SearchCriteria;
 using Lucene.Net.Documents;
-using our.Models;
 using OurUmbraco.Forum.Extensions;
+using OurUmbraco.Our.Examine;
+using OurUmbraco.Our.Models;
 using Umbraco.Web.WebApi;
 
-namespace our.Api
+namespace OurUmbraco.Our.Api
 {
     public class OurSearchController : UmbracoApiController
     {
diff --git a/OurUmbraco/Our/Businesslogic/ProjectContributor.cs b/OurUmbraco/Our/Businesslogic/ProjectContributor.cs
index 971be8ce..38153211 100644
--- a/OurUmbraco/Our/Businesslogic/ProjectContributor.cs
+++ b/OurUmbraco/Our/Businesslogic/ProjectContributor.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using OurUmbraco.Our;
-
-namespace our.Businesslogic
+namespace OurUmbraco.Our.Businesslogic
 {
     public class ProjectContributor
     {
diff --git a/OurUmbraco/Our/Controllers/AvatarController.cs b/OurUmbraco/Our/Controllers/AvatarController.cs
index 63a59b28..ebaba765 100644
--- a/OurUmbraco/Our/Controllers/AvatarController.cs
+++ b/OurUmbraco/Our/Controllers/AvatarController.cs
@@ -1,8 +1,7 @@
 using System.Web.Http;
-using OurUmbraco.Our;
 using Umbraco.Web.WebApi;
 
-namespace our.Controllers
+namespace OurUmbraco.Our.Controllers
 {
     public class AvatarController : UmbracoApiController
     {
diff --git a/OurUmbraco/Our/Controllers/LoginController.cs b/OurUmbraco/Our/Controllers/LoginController.cs
index feaec5ba..ac30228c 100644
--- a/OurUmbraco/Our/Controllers/LoginController.cs
+++ b/OurUmbraco/Our/Controllers/LoginController.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Security;
 using Umbraco.Web.Mvc;
 
-namespace our.Controllers
+namespace OurUmbraco.Our.Controllers
 {
     public class LoginController: SurfaceController
     {
diff --git a/OurUmbraco/Our/Controllers/ProfileController.cs b/OurUmbraco/Our/Controllers/ProfileController.cs
index 2ea7f444..ac76b768 100644
--- a/OurUmbraco/Our/Controllers/ProfileController.cs
+++ b/OurUmbraco/Our/Controllers/ProfileController.cs
@@ -1,15 +1,8 @@
-using our.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-using OurUmbraco.Our;
-using Umbraco.Web;
+using System.Web.Mvc;
+using OurUmbraco.Our.Models;
 using Umbraco.Web.Mvc;
 
-namespace our.Controllers
+namespace OurUmbraco.Our.Controllers
 {
     public class ProfileController: SurfaceController
     {
diff --git a/OurUmbraco/Our/Controllers/ProfileNotificationController.cs b/OurUmbraco/Our/Controllers/ProfileNotificationController.cs
index 156814e9..522c5a22 100644
--- a/OurUmbraco/Our/Controllers/ProfileNotificationController.cs
+++ b/OurUmbraco/Our/Controllers/ProfileNotificationController.cs
@@ -1,13 +1,8 @@
-using our.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Mvc;
+using System.Web.Mvc;
+using OurUmbraco.Our.Models;
 using Umbraco.Web.Mvc;
 
-namespace our.Controllers
+namespace OurUmbraco.Our.Controllers
 {
     public class ProfileNotificationController: SurfaceController
     {
diff --git a/OurUmbraco/Our/Controllers/RegisterController.cs b/OurUmbraco/Our/Controllers/RegisterController.cs
index 224710b8..f6c986be 100644
--- a/OurUmbraco/Our/Controllers/RegisterController.cs
+++ b/OurUmbraco/Our/Controllers/RegisterController.cs
@@ -1,13 +1,8 @@
-using our.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.Mvc;
+using System.Web.Mvc;
+using OurUmbraco.Our.Models;
 using Umbraco.Web.Mvc;
 
-namespace our.Controllers
+namespace OurUmbraco.Our.Controllers
 {
     public class RegisterController : SurfaceController
     {
diff --git a/OurUmbraco/Our/CustomHandlers/CommentVote.cs b/OurUmbraco/Our/CustomHandlers/CommentVote.cs
index 9f0a5585..f4f7e743 100644
--- a/OurUmbraco/Our/CustomHandlers/CommentVote.cs
+++ b/OurUmbraco/Our/CustomHandlers/CommentVote.cs
@@ -4,9 +4,8 @@ using OurUmbraco.Powers.BusinessLogic;
 using OurUmbraco.Powers.Library;
 using Umbraco.Core;
 using Action = OurUmbraco.Powers.BusinessLogic.Action;
-using Data = OurUmbraco.Our.Data;
 
-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
     /// <summary>
     /// This is a custom handler to catch all voting events on topics
diff --git a/OurUmbraco/Our/CustomHandlers/ExternalVote.cs b/OurUmbraco/Our/CustomHandlers/ExternalVote.cs
index 15840089..ed66d99d 100644
--- a/OurUmbraco/Our/CustomHandlers/ExternalVote.cs
+++ b/OurUmbraco/Our/CustomHandlers/ExternalVote.cs
@@ -3,7 +3,7 @@ using OurUmbraco.Powers.BusinessLogic;
 using umbraco.BusinessLogic;
 using Action = OurUmbraco.Powers.BusinessLogic.Action;
 
-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
 	public class ExternalVote : ApplicationBase
 	{
diff --git a/OurUmbraco/Our/CustomHandlers/ForumIndexer.cs b/OurUmbraco/Our/CustomHandlers/ForumIndexer.cs
index 97ca83b3..c2d71354 100644
--- a/OurUmbraco/Our/CustomHandlers/ForumIndexer.cs
+++ b/OurUmbraco/Our/CustomHandlers/ForumIndexer.cs
@@ -1,14 +1,15 @@
 using Examine;
 using Examine.LuceneEngine;
 using Examine.LuceneEngine.Providers;
-using our.Examine;
 using OurUmbraco.Forum;
 using OurUmbraco.Forum.Services;
+using OurUmbraco.Our.Examine;
 using Umbraco.Core;
+
 //WB Added
 
 
-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
     public class ForumIndexer : ApplicationEventHandler
     {
diff --git a/OurUmbraco/Our/CustomHandlers/ForumPostsCounter.cs b/OurUmbraco/Our/CustomHandlers/ForumPostsCounter.cs
index 114a7d6d..9d86c5e1 100644
--- a/OurUmbraco/Our/CustomHandlers/ForumPostsCounter.cs
+++ b/OurUmbraco/Our/CustomHandlers/ForumPostsCounter.cs
@@ -5,7 +5,7 @@ using OurUmbraco.Powers.BusinessLogic;
 using Umbraco.Core;
 using Umbraco.Web;
 
-namespace our.CustomHandlers {
+namespace OurUmbraco.Our.CustomHandlers {
     public class ForumPostsCounter : ApplicationEventHandler {
 
         /*
diff --git a/OurUmbraco/Our/CustomHandlers/OurApplicationStartupHandler.cs b/OurUmbraco/Our/CustomHandlers/OurApplicationStartupHandler.cs
index 5ef518c7..ab954a3d 100644
--- a/OurUmbraco/Our/CustomHandlers/OurApplicationStartupHandler.cs
+++ b/OurUmbraco/Our/CustomHandlers/OurApplicationStartupHandler.cs
@@ -1,19 +1,14 @@
-using System.IO;
-using System.Web.Compilation;
-using System.Web.Hosting;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
-using System.Web.UI;
 using Examine;
 using Examine.LuceneEngine.Providers;
-using our.Examine;
 using OurUmbraco.Documentation.Busineslogic;
 using OurUmbraco.Documentation.Busineslogic.GithubSourcePull;
+using OurUmbraco.Our.Examine;
 using Umbraco.Core;
 using Umbraco.Web;
-using Umbraco.Web.Security;
 
-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
     /// <summary>
     /// Main Application startup handler
diff --git a/OurUmbraco/Our/CustomHandlers/ProjectIndexer.cs b/OurUmbraco/Our/CustomHandlers/ProjectIndexer.cs
index 52c1cfd4..c869d871 100644
--- a/OurUmbraco/Our/CustomHandlers/ProjectIndexer.cs
+++ b/OurUmbraco/Our/CustomHandlers/ProjectIndexer.cs
@@ -3,8 +3,7 @@ using System.Linq;
 using Examine;
 using Examine.LuceneEngine;
 using Examine.LuceneEngine.Providers;
-using our.Examine;
-using OurUmbraco.Our;
+using OurUmbraco.Our.Examine;
 using OurUmbraco.Wiki.BusinessLogic;
 using Umbraco.Core;
 using Umbraco.Core.Models;
@@ -12,7 +11,7 @@ using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Services;
 using Umbraco.Web;
 
-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
     public class ProjectIndexer : ApplicationEventHandler
     {
diff --git a/OurUmbraco/Our/CustomHandlers/ProjectVote.cs b/OurUmbraco/Our/CustomHandlers/ProjectVote.cs
index bd253a4c..6e2659c2 100644
--- a/OurUmbraco/Our/CustomHandlers/ProjectVote.cs
+++ b/OurUmbraco/Our/CustomHandlers/ProjectVote.cs
@@ -4,9 +4,8 @@ using OurUmbraco.Powers.Library;
 using Umbraco.Core;
 using Umbraco.Web;
 using Action = OurUmbraco.Powers.BusinessLogic.Action;
-using Utils = OurUmbraco.Our.Utils;
 
-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
     public class ProjectVoteHandler : ApplicationEventHandler
     {
diff --git a/OurUmbraco/Our/CustomHandlers/ProjectsEnsureGuid.cs b/OurUmbraco/Our/CustomHandlers/ProjectsEnsureGuid.cs
index 8b2641c5..4253db7f 100644
--- a/OurUmbraco/Our/CustomHandlers/ProjectsEnsureGuid.cs
+++ b/OurUmbraco/Our/CustomHandlers/ProjectsEnsureGuid.cs
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using OurUmbraco.Powers.Library;
 using OurUmbraco.Wiki.BusinessLogic;
-using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.web;
 using Umbraco.Core;
 
-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
     public class ProjectsEnsureGuid : ApplicationEventHandler
     {
diff --git a/OurUmbraco/Our/CustomHandlers/SearchPageRouteHandler.cs b/OurUmbraco/Our/CustomHandlers/SearchPageRouteHandler.cs
index 3c161f70..3dc2c5ad 100644
--- a/OurUmbraco/Our/CustomHandlers/SearchPageRouteHandler.cs
+++ b/OurUmbraco/Our/CustomHandlers/SearchPageRouteHandler.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web;
 using Umbraco.Web.Mvc;
 
-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
     /// <summary>
     /// Custom route handler for the search page
diff --git a/OurUmbraco/Our/CustomHandlers/TopicVote.cs b/OurUmbraco/Our/CustomHandlers/TopicVote.cs
index b03cdf8b..cf27ae04 100644
--- a/OurUmbraco/Our/CustomHandlers/TopicVote.cs
+++ b/OurUmbraco/Our/CustomHandlers/TopicVote.cs
@@ -6,9 +6,8 @@ using OurUmbraco.Powers.BusinessLogic;
 using OurUmbraco.Powers.Library;
 using Umbraco.Core;
 using Action = OurUmbraco.Powers.BusinessLogic.Action;
-using Data = OurUmbraco.Our.Data;
 
-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
     /// <summary>
     /// This is a custom handler to catch all voting events on topics
diff --git a/OurUmbraco/Our/CustomHandlers/memberSave.cs b/OurUmbraco/Our/CustomHandlers/memberSave.cs
index dc6d939c..857467f9 100644
--- a/OurUmbraco/Our/CustomHandlers/memberSave.cs
+++ b/OurUmbraco/Our/CustomHandlers/memberSave.cs
@@ -1,7 +1,7 @@
 using umbraco.cms.businesslogic.member;
 using Umbraco.Core;
 
-namespace our.CustomHandlers
+namespace OurUmbraco.Our.CustomHandlers
 {
     public class MemberSave : ApplicationEventHandler
     {
diff --git a/OurUmbraco/Our/DefaultMemberAvatarHandler.cs b/OurUmbraco/Our/DefaultMemberAvatarHandler.cs
index 7fd01350..ed1fae27 100644
--- a/OurUmbraco/Our/DefaultMemberAvatarHandler.cs
+++ b/OurUmbraco/Our/DefaultMemberAvatarHandler.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.IO;
 using System.Web;
-using System.IO;
 
-namespace our
+namespace OurUmbraco.Our
 {
     public class DefaultMemberAvatarHandler: IHttpHandler
     {
diff --git a/OurUmbraco/Our/Examine/DocumentationIndexConfig.cs b/OurUmbraco/Our/Examine/DocumentationIndexConfig.cs
index 8dea1434..2038d4b0 100644
--- a/OurUmbraco/Our/Examine/DocumentationIndexConfig.cs
+++ b/OurUmbraco/Our/Examine/DocumentationIndexConfig.cs
@@ -1,6 +1,6 @@
 using System.Configuration;
 
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
     public sealed class DocumentationIndexConfig : ConfigurationSection
     {
diff --git a/OurUmbraco/Our/Examine/DocumentationIndexDataService.cs b/OurUmbraco/Our/Examine/DocumentationIndexDataService.cs
index a9229ff6..1dadef0e 100644
--- a/OurUmbraco/Our/Examine/DocumentationIndexDataService.cs
+++ b/OurUmbraco/Our/Examine/DocumentationIndexDataService.cs
@@ -1,13 +1,11 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Web;
 using Examine;
 using Examine.LuceneEngine;
 using OurUmbraco.Documentation.Busineslogic.GithubSourcePull;
-using umbraco.BusinessLogic;
 
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
     /// <summary>
     /// Used to index the documentation 
diff --git a/OurUmbraco/Our/Examine/ExamineHelper.cs b/OurUmbraco/Our/Examine/ExamineHelper.cs
index 1ff4a14b..cbdbd209 100644
--- a/OurUmbraco/Our/Examine/ExamineHelper.cs
+++ b/OurUmbraco/Our/Examine/ExamineHelper.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -8,7 +7,7 @@ using Examine;
 using Examine.LuceneEngine;
 using Umbraco.Core.Logging;
 
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
     public static class ExamineHelper
     {
diff --git a/OurUmbraco/Our/Examine/ForumDataService.cs b/OurUmbraco/Our/Examine/ForumDataService.cs
index 244b8898..076ae577 100644
--- a/OurUmbraco/Our/Examine/ForumDataService.cs
+++ b/OurUmbraco/Our/Examine/ForumDataService.cs
@@ -1,17 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using Examine;
 using Examine.LuceneEngine;
 using OurUmbraco.Forum.Models;
 using OurUmbraco.Forum.Services;
-//WB Added
+using umbraco;
 using Umbraco.Core;
+//WB Added
 
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
-   
     /// <summary>
     /// The data service used by the LuceneEngine in order for it to reindex all data
     /// </summary>
@@ -25,7 +22,7 @@ namespace our.Examine
             foreach (var currentComment in topic.Comments)
                 commentText += currentComment.Body;
 
-            var body = umbraco.library.StripHtml(topic.Body + commentText);
+            var body = library.StripHtml(topic.Body + commentText);
 
             simpleDataSet.NodeDefinition.NodeId = id;
             simpleDataSet.NodeDefinition.Type = indexType;
diff --git a/OurUmbraco/Our/Examine/OurSearcher.cs b/OurUmbraco/Our/Examine/OurSearcher.cs
index 75548c3c..9f85bfe9 100644
--- a/OurUmbraco/Our/Examine/OurSearcher.cs
+++ b/OurUmbraco/Our/Examine/OurSearcher.cs
@@ -7,9 +7,9 @@ using System.Text;
 using System.Text.RegularExpressions;
 using Examine;
 using Examine.LuceneEngine.Providers;
-using our.Models;
+using OurUmbraco.Our.Models;
 
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
     public class OurSearcher
     {
diff --git a/OurUmbraco/Our/Examine/ProjectAnalyzer.cs b/OurUmbraco/Our/Examine/ProjectAnalyzer.cs
index 0746de9e..4b836e9f 100644
--- a/OurUmbraco/Our/Examine/ProjectAnalyzer.cs
+++ b/OurUmbraco/Our/Examine/ProjectAnalyzer.cs
@@ -1,7 +1,7 @@
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Standard;
 
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
     /// <summary>
     /// Custom analyzer for projects so that we can have different analyzers per field
diff --git a/OurUmbraco/Our/Examine/ProjectNodeIndexDataService.cs b/OurUmbraco/Our/Examine/ProjectNodeIndexDataService.cs
index 530bd202..ddfb4494 100644
--- a/OurUmbraco/Our/Examine/ProjectNodeIndexDataService.cs
+++ b/OurUmbraco/Our/Examine/ProjectNodeIndexDataService.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Hosting;
 using Examine;
 using Examine.LuceneEngine;
-using Lucene.Net.Documents;
-using Lucene.Net.Util;
-using OurUmbraco.Our;
 using OurUmbraco.Wiki.BusinessLogic;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
@@ -17,7 +12,7 @@ using Umbraco.Core.Models;
 using Umbraco.Web;
 using Umbraco.Web.Security;
 
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
     /// <summary>
     /// Data service used for projects
diff --git a/OurUmbraco/Our/Examine/SearchFilter.cs b/OurUmbraco/Our/Examine/SearchFilter.cs
index e88294ab..e99a7c90 100644
--- a/OurUmbraco/Our/Examine/SearchFilter.cs
+++ b/OurUmbraco/Our/Examine/SearchFilter.cs
@@ -1,4 +1,4 @@
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
     public class SearchFilter
     {
diff --git a/OurUmbraco/Our/Examine/SearchFilters.cs b/OurUmbraco/Our/Examine/SearchFilters.cs
index f45d8149..72867f05 100644
--- a/OurUmbraco/Our/Examine/SearchFilters.cs
+++ b/OurUmbraco/Our/Examine/SearchFilters.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Text;
 using Examine.SearchCriteria;
 
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
     public class SearchFilters
     {
diff --git a/OurUmbraco/Our/Examine/VersionAnalyzer.cs b/OurUmbraco/Our/Examine/VersionAnalyzer.cs
index 6568d0f3..c66b9dbb 100644
--- a/OurUmbraco/Our/Examine/VersionAnalyzer.cs
+++ b/OurUmbraco/Our/Examine/VersionAnalyzer.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using Lucene.Net.Analysis;
 
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
     /// <summary>
     /// Custom version field analyzer which uses the Version Tokenizer
diff --git a/OurUmbraco/Our/Examine/VersionTokenizer.cs b/OurUmbraco/Our/Examine/VersionTokenizer.cs
index 09b0fbad..844f0dca 100644
--- a/OurUmbraco/Our/Examine/VersionTokenizer.cs
+++ b/OurUmbraco/Our/Examine/VersionTokenizer.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using Lucene.Net.Analysis;
 
-namespace our.Examine
+namespace OurUmbraco.Our.Examine
 {
     /// <summary>
     /// Custom tokenizer to ensure that only version information is indexed
diff --git a/OurUmbraco/Our/HackedCdfLoader.cs b/OurUmbraco/Our/HackedCdfLoader.cs
index 49ce8bf3..8c4e2990 100644
--- a/OurUmbraco/Our/HackedCdfLoader.cs
+++ b/OurUmbraco/Our/HackedCdfLoader.cs
@@ -3,7 +3,7 @@ using System.Web;
 using System.Web.UI;
 using ClientDependency.Core.Controls;
 
-namespace our
+namespace OurUmbraco.Our
 {
     /// <summary>
     /// This should not be necessary but we are mixing webforms with mvc sub forms and normally that should work or be done, without
diff --git a/OurUmbraco/Our/Hiccup.cs b/OurUmbraco/Our/Hiccup.cs
index f6956277..cf7319c1 100644
--- a/OurUmbraco/Our/Hiccup.cs
+++ b/OurUmbraco/Our/Hiccup.cs
@@ -2,7 +2,7 @@
 using System.Web.UI;
 using System.Web.UI.WebControls;
 
-namespace our
+namespace OurUmbraco.Our
 {
     public class Hiccup : Page
     {
diff --git a/OurUmbraco/Our/MigrationsHandler.cs b/OurUmbraco/Our/MigrationsHandler.cs
index 931cd446..3a0411ac 100644
--- a/OurUmbraco/Our/MigrationsHandler.cs
+++ b/OurUmbraco/Our/MigrationsHandler.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Models;
 using Umbraco.Web;
 using File = System.IO.File;
 
-namespace our
+namespace OurUmbraco.Our
 {
     public class MigrationsHandler : ApplicationEventHandler
     {
diff --git a/OurUmbraco/Our/Models/ProfileModel.cs b/OurUmbraco/Our/Models/ProfileModel.cs
index 9465ac79..83e5daea 100644
--- a/OurUmbraco/Our/Models/ProfileModel.cs
+++ b/OurUmbraco/Our/Models/ProfileModel.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
-namespace our.Models
+namespace OurUmbraco.Our.Models
 {
     public class ProfileModel
     {
diff --git a/OurUmbraco/Our/Models/ProfileNotificationModel.cs b/OurUmbraco/Our/Models/ProfileNotificationModel.cs
index 466b9488..1cbec0f0 100644
--- a/OurUmbraco/Our/Models/ProfileNotificationModel.cs
+++ b/OurUmbraco/Our/Models/ProfileNotificationModel.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
 
-namespace our.Models
+namespace OurUmbraco.Our.Models
 {
     public class ProfileNotificationModel
     {
diff --git a/OurUmbraco/Our/Models/RegisterModel.cs b/OurUmbraco/Our/Models/RegisterModel.cs
index e46e04ae..825cab42 100644
--- a/OurUmbraco/Our/Models/RegisterModel.cs
+++ b/OurUmbraco/Our/Models/RegisterModel.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
 
-namespace our.Models
+namespace OurUmbraco.Our.Models
 {
     public class RegisterModel
     {
diff --git a/OurUmbraco/Our/Models/SearchResultContentModel.cs b/OurUmbraco/Our/Models/SearchResultContentModel.cs
index e3889a7b..5cbe2917 100644
--- a/OurUmbraco/Our/Models/SearchResultContentModel.cs
+++ b/OurUmbraco/Our/Models/SearchResultContentModel.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core.Models;
+using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 
-namespace our.Models
+namespace OurUmbraco.Our.Models
 {
     /// <summary>
     /// An IPublishedContent model used to display the search results on the SearchResults controller
diff --git a/OurUmbraco/Our/Models/SearchResultModel.cs b/OurUmbraco/Our/Models/SearchResultModel.cs
index d0bb8a3f..0f3544ca 100644
--- a/OurUmbraco/Our/Models/SearchResultModel.cs
+++ b/OurUmbraco/Our/Models/SearchResultModel.cs
@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using Examine;
 
-namespace our.Models
+namespace OurUmbraco.Our.Models
 {
     /// <summary>
     /// A model to display search results
diff --git a/OurUmbraco/Our/ProjectFileUploadHandler.cs b/OurUmbraco/Our/ProjectFileUploadHandler.cs
index 9d7a077c..d247e13c 100644
--- a/OurUmbraco/Our/ProjectFileUploadHandler.cs
+++ b/OurUmbraco/Our/ProjectFileUploadHandler.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Web;
-using OurUmbraco.Our;
 using OurUmbraco.Wiki.BusinessLogic;
-using umbraco.cms.businesslogic.web;
-using umbraco.cms.businesslogic;
 using umbraco.cms.businesslogic.member;
+using umbraco.cms.businesslogic.web;
 
-namespace our {
+namespace OurUmbraco.Our {
     public class ProjectFileUploadHandler : IHttpHandler {
 
         #region IHttpHandler Members
diff --git a/OurUmbraco/Our/Rest.cs b/OurUmbraco/Our/Rest.cs
index b1417401..d416f409 100644
--- a/OurUmbraco/Our/Rest.cs
+++ b/OurUmbraco/Our/Rest.cs
@@ -1,12 +1,11 @@
 using System.Web;
 using System.Web.Security;
 using System.Xml.XPath;
-using OurUmbraco.Our;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.member;
 using Umbraco.Web.BaseRest;
 
-namespace our
+namespace OurUmbraco.Our
 {
     /// <summary>
     /// Our mighty utill classes for looking stuff up quickly...
diff --git a/OurUmbraco/Our/Scheduling/Scheduler.cs b/OurUmbraco/Our/Scheduling/Scheduler.cs
index 0353a428..d2cf5c66 100644
--- a/OurUmbraco/Our/Scheduling/Scheduler.cs
+++ b/OurUmbraco/Our/Scheduling/Scheduler.cs
@@ -1,10 +1,9 @@
 using System.Threading;
 using System.Web;
 using Umbraco.Core;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 
-namespace our.Scheduling
+namespace OurUmbraco.Our.Scheduling
 {
     /// <summary>
     /// Used to do the scheduling for tasks, publishing, etc...
diff --git a/OurUmbraco/Our/Scheduling/YouTrackSync.cs b/OurUmbraco/Our/Scheduling/YouTrackSync.cs
index 86a672c9..06c4b3a0 100644
--- a/OurUmbraco/Our/Scheduling/YouTrackSync.cs
+++ b/OurUmbraco/Our/Scheduling/YouTrackSync.cs
@@ -3,7 +3,7 @@ using OurUmbraco.Release;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 
-namespace our.Scheduling
+namespace OurUmbraco.Our.Scheduling
 {
     internal class YouTrackSync
     {
diff --git a/OurUmbraco/Our/SearchResultExtensions.cs b/OurUmbraco/Our/SearchResultExtensions.cs
index 5a597a89..3be41833 100644
--- a/OurUmbraco/Our/SearchResultExtensions.cs
+++ b/OurUmbraco/Our/SearchResultExtensions.cs
@@ -6,7 +6,7 @@ using Examine;
 using umbraco;
 using Umbraco.Web;
 
-namespace our
+namespace OurUmbraco.Our
 {
     public static class SearchResultExtensions
     {
diff --git a/OurUmbraco/Our/controls/DateTimePicker.cs b/OurUmbraco/Our/controls/DateTimePicker.cs
index 5e1e307c..211ce5ce 100644
--- a/OurUmbraco/Our/controls/DateTimePicker.cs
+++ b/OurUmbraco/Our/controls/DateTimePicker.cs
@@ -5,7 +5,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using AjaxControlToolkit;
 
-namespace our.Controls
+namespace OurUmbraco.Our.controls
 {
     [ValidationProperty("SelectedDate")]
     public class DatePicker : System.Web.UI.WebControls.WebControl, System.Web.UI.INamingContainer
diff --git a/OurUmbraco/Our/usercontrols/EventEditor.ascx b/OurUmbraco/Our/usercontrols/EventEditor.ascx
index 6fad730a..64639988 100644
--- a/OurUmbraco/Our/usercontrols/EventEditor.ascx
+++ b/OurUmbraco/Our/usercontrols/EventEditor.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EventEditor.ascx.cs" Inherits="our.usercontrols.EventEditor" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EventEditor.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.EventEditor" %>
 <%@ Import Namespace="umbraco.cms.businesslogic.member" %>
 <link rel="stylesheet" media="all" type="text/css" href="/css/ui-lightness/jquery-ui-1.8.16.custom.css" />
 
diff --git a/OurUmbraco/Our/usercontrols/EventEditor.ascx.cs b/OurUmbraco/Our/usercontrols/EventEditor.ascx.cs
index a97c19bd..2c3b28a8 100644
--- a/OurUmbraco/Our/usercontrols/EventEditor.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/EventEditor.ascx.cs
@@ -1,16 +1,15 @@
 using System;
 using System.Configuration;
-using System.Linq;
-using System.Web.UI;
-using Umbraco.Core;
-using Umbraco.Core.Models;
 using System.Net.Mail;
+using System.Web.UI;
 using OurUmbraco.Events.Relations;
 using umbraco.BusinessLogic;
+using Umbraco.Core;
+using Umbraco.Core.Models;
 using Umbraco.Web;
 using Member = umbraco.cms.businesslogic.member.Member;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class EventEditor : UserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/EventEditor.ascx.designer.cs b/OurUmbraco/Our/usercontrols/EventEditor.ascx.designer.cs
index 5f665c63..a4cbfeac 100644
--- a/OurUmbraco/Our/usercontrols/EventEditor.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/EventEditor.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class EventEditor {
diff --git a/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx b/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx
index 6a2e7ef9..60aee6f4 100644
--- a/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx
+++ b/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx
@@ -1 +1 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="FileDownloadProxy.ascx.cs" Inherits="our.usercontrols.FileDownloadProxy" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="FileDownloadProxy.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.FileDownloadProxy" %>
diff --git a/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx.cs b/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx.cs
index 0bc18755..c9a54c94 100644
--- a/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx.cs
@@ -1,14 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
 using OurUmbraco.Wiki.BusinessLogic;
 using BL = umbraco.BusinessLogic;
-using umbraco.cms.businesslogic.member;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class FileDownloadProxy : System.Web.UI.UserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx.designer.cs b/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx.designer.cs
index 7820a235..2e0384e0 100644
--- a/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx.designer.cs
@@ -1,18 +1,15 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.42
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols
-{
-
-
-    public partial class FileDownloadProxy
-    {
+namespace OurUmbraco.Our.usercontrols {
+    
+    
+    public partial class FileDownloadProxy {
     }
 }
diff --git a/OurUmbraco/Our/usercontrols/Forgotpassword.ascx b/OurUmbraco/Our/usercontrols/Forgotpassword.ascx
index 359eec5d..19aee5c5 100644
--- a/OurUmbraco/Our/usercontrols/Forgotpassword.ascx
+++ b/OurUmbraco/Our/usercontrols/Forgotpassword.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Forgotpassword.ascx.cs" Inherits="our.usercontrols.Forgotpassword" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Forgotpassword.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.Forgotpassword" %>
 <asp:Panel runat="server" ID="message" Visible="False">
     <div class="notice">
         <p style="color: green;">A new password has been sent to the email address: <asp:Literal ID="lt_email" runat="server" /></p>
diff --git a/OurUmbraco/Our/usercontrols/Forgotpassword.ascx.cs b/OurUmbraco/Our/usercontrols/Forgotpassword.ascx.cs
index 0875bcf3..ea5e4a58 100644
--- a/OurUmbraco/Our/usercontrols/Forgotpassword.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/Forgotpassword.ascx.cs
@@ -6,7 +6,7 @@ using System.Text;
 using Umbraco.Core;
 using Umbraco.Web.UI.Controls;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class Forgotpassword : UmbracoUserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/Forgotpassword.ascx.designer.cs b/OurUmbraco/Our/usercontrols/Forgotpassword.ascx.designer.cs
index 62f81d19..11b58188 100644
--- a/OurUmbraco/Our/usercontrols/Forgotpassword.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/Forgotpassword.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class Forgotpassword {
diff --git a/OurUmbraco/Our/usercontrols/InsertImage.ascx b/OurUmbraco/Our/usercontrols/InsertImage.ascx
index d4c238ad..ee3756e5 100644
--- a/OurUmbraco/Our/usercontrols/InsertImage.ascx
+++ b/OurUmbraco/Our/usercontrols/InsertImage.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="InsertImage.ascx.cs"
-    Inherits="our.usercontrols.InsertImage" %>
+    Inherits="OurUmbraco.Our.usercontrols.InsertImage" %>
 
 
 <script type="text/javascript">
diff --git a/OurUmbraco/Our/usercontrols/InsertImage.ascx.cs b/OurUmbraco/Our/usercontrols/InsertImage.ascx.cs
index e317822c..64457c18 100644
--- a/OurUmbraco/Our/usercontrols/InsertImage.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/InsertImage.ascx.cs
@@ -1,9 +1,8 @@
 using System;
-using System.Linq;
-using System.Web.UI;
 using System.IO;
+using System.Web.UI;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class InsertImage : UserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/InsertImage.ascx.designer.cs b/OurUmbraco/Our/usercontrols/InsertImage.ascx.designer.cs
index 963b3d07..96471f76 100644
--- a/OurUmbraco/Our/usercontrols/InsertImage.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/InsertImage.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class InsertImage {
diff --git a/OurUmbraco/Our/usercontrols/Login.ascx b/OurUmbraco/Our/usercontrols/Login.ascx
index 9c508330..06ea47dd 100644
--- a/OurUmbraco/Our/usercontrols/Login.ascx
+++ b/OurUmbraco/Our/usercontrols/Login.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Login.ascx.cs" Inherits="our.usercontrols.Login" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Login.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.Login" %>
 
 <asp:Panel runat="server" DefaultButton="bt_login">
     <div class="form simpleForm" id="registrationForm">
diff --git a/OurUmbraco/Our/usercontrols/Login.ascx.cs b/OurUmbraco/Our/usercontrols/Login.ascx.cs
index 264e076c..4858ccae 100644
--- a/OurUmbraco/Our/usercontrols/Login.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/Login.ascx.cs
@@ -5,7 +5,7 @@ using umbraco;
 using Umbraco.Core;
 using Umbraco.Web.UI.Controls;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class Login : UmbracoUserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/Login.ascx.designer.cs b/OurUmbraco/Our/usercontrols/Login.ascx.designer.cs
index eae94f6e..cdbfedbb 100644
--- a/OurUmbraco/Our/usercontrols/Login.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/Login.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class Login {
diff --git a/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx b/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx
index 39c191d1..6ace6972 100644
--- a/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx
+++ b/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectCollabRequest.ascx.cs" Inherits="our.usercontrols.ProjectCollabRequest" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectCollabRequest.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectCollabRequest" %>
 
 <h1><asp:Literal runat="server" ID="lt_title" Text="Create project"></asp:Literal> collaboration request</h1>
 
diff --git a/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx.cs b/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx.cs
index 90315f53..5c4cc829 100644
--- a/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx.cs
@@ -1,13 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using umbraco.cms.businesslogic.member;
 using System.Net.Mail;
+using umbraco.cms.businesslogic.member;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class ProjectCollabRequest : System.Web.UI.UserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx.designer.cs b/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx.designer.cs
index 97d34f55..43089a9f 100644
--- a/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/ProjectCollabRequest.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class ProjectCollabRequest {
diff --git a/OurUmbraco/Our/usercontrols/ProjectContributors.ascx b/OurUmbraco/Our/usercontrols/ProjectContributors.ascx
index 18f68f02..d68665f9 100644
--- a/OurUmbraco/Our/usercontrols/ProjectContributors.ascx
+++ b/OurUmbraco/Our/usercontrols/ProjectContributors.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectContributors.ascx.cs" Inherits="our.usercontrols.ProjectContributors" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectContributors.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectContributors" %>
 
 <asp:Panel ID="holder" runat="server" Visible="false">
 
diff --git a/OurUmbraco/Our/usercontrols/ProjectContributors.ascx.cs b/OurUmbraco/Our/usercontrols/ProjectContributors.ascx.cs
index 6c97a826..59e4d691 100644
--- a/OurUmbraco/Our/usercontrols/ProjectContributors.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/ProjectContributors.ascx.cs
@@ -1,14 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
+using OurUmbraco.Our.Businesslogic;
 using umbraco.cms.businesslogic.member;
 using umbraco.cms.businesslogic.web;
-using our.Businesslogic;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class ProjectContributors : System.Web.UI.UserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/ProjectContributors.ascx.designer.cs b/OurUmbraco/Our/usercontrols/ProjectContributors.ascx.designer.cs
index 8b47213d..7a464ae1 100644
--- a/OurUmbraco/Our/usercontrols/ProjectContributors.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/ProjectContributors.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class ProjectContributors {
diff --git a/OurUmbraco/Our/usercontrols/ProjectEditor.ascx b/OurUmbraco/Our/usercontrols/ProjectEditor.ascx
index 2506fb05..f28b5afb 100644
--- a/OurUmbraco/Our/usercontrols/ProjectEditor.ascx
+++ b/OurUmbraco/Our/usercontrols/ProjectEditor.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectEditor.ascx.cs" Inherits="our.usercontrols.ProjectEditor" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectEditor.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectEditor" %>
 
 <asp:PlaceHolder runat="server" ID="notallowed" Visible="False">
     <h2>Sorry, your account is too new to create projects! If you're human, make sure to <a href="https://umbraco.com/about-us/team">get in touch with us</a> to get this restriction lifted.</h2>
diff --git a/OurUmbraco/Our/usercontrols/ProjectEditor.ascx.cs b/OurUmbraco/Our/usercontrols/ProjectEditor.ascx.cs
index 8425b2e3..3aad4340 100644
--- a/OurUmbraco/Our/usercontrols/ProjectEditor.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/ProjectEditor.ascx.cs
@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Xml.XPath;
-using our.Api;
-using OurUmbraco.Our;
+using OurUmbraco.Our.Api;
 using OurUmbraco.Repository;
 using OurUmbraco.Wiki.BusinessLogic;
 using umbraco;
@@ -14,7 +13,7 @@ using umbraco.cms.businesslogic.web;
 using umbraco.interfaces;
 using umbraco.presentation.nodeFactory;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class ProjectEditor : UserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/ProjectEditor.ascx.designer.cs b/OurUmbraco/Our/usercontrols/ProjectEditor.ascx.designer.cs
index c2d2c5f5..1e14568d 100644
--- a/OurUmbraco/Our/usercontrols/ProjectEditor.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/ProjectEditor.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class ProjectEditor {
diff --git a/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx b/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx
index 26c76de2..b47a3125 100644
--- a/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx
+++ b/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectFileUpload.ascx.cs" Inherits="our.usercontrols.ProjectFileUpload" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectFileUpload.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectFileUpload" %>
 
 
 <asp:PlaceHolder ID="holder" runat="server" Visible="false">
diff --git a/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx.cs b/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx.cs
index d3b0312b..c7685c00 100644
--- a/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx.cs
@@ -1,16 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
 using System.Web.UI.WebControls;
-using OurUmbraco.Our;
 using OurUmbraco.Wiki.BusinessLogic;
 using umbraco.cms.businesslogic.member;
-using umbraco.presentation.nodeFactory;
 using umbraco.cms.businesslogic.web;
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     public partial class ProjectFileUpload : System.Web.UI.UserControl {
        
         public string MemberGuid = "";
diff --git a/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx.designer.cs b/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx.designer.cs
index a80a77d9..f53b55a0 100644
--- a/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/ProjectFileUpload.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class ProjectFileUpload {
diff --git a/OurUmbraco/Our/usercontrols/ProjectForums.ascx b/OurUmbraco/Our/usercontrols/ProjectForums.ascx
index 8f986401..196196e1 100644
--- a/OurUmbraco/Our/usercontrols/ProjectForums.ascx
+++ b/OurUmbraco/Our/usercontrols/ProjectForums.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectForums.ascx.cs" Inherits="our.usercontrols.ProjectForums" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProjectForums.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.ProjectForums" %>
 
 <asp:PlaceHolder ID="holder" runat="server" Visible="false">
 
diff --git a/OurUmbraco/Our/usercontrols/ProjectForums.ascx.cs b/OurUmbraco/Our/usercontrols/ProjectForums.ascx.cs
index b02704ac..59473981 100644
--- a/OurUmbraco/Our/usercontrols/ProjectForums.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/ProjectForums.ascx.cs
@@ -1,17 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
 using System.Web.UI.WebControls;
-using OurUmbraco.Forum.Models;
 using OurUmbraco.Forum.Services;
 using umbraco.cms.businesslogic.member;
 using umbraco.cms.businesslogic.web;
 using umbraco.presentation.nodeFactory;
 using Umbraco.Core;
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     public partial class ProjectForums : System.Web.UI.UserControl
     {
 
@@ -68,7 +63,7 @@ namespace our.usercontrols {
         protected void bindForum(object sender, RepeaterItemEventArgs e) {
 
             if (e.Item.ItemType == ListItemType.AlternatingItem || e.Item.ItemType == ListItemType.Item) {
-                var f = (Forum)e.Item.DataItem;
+                var f = (Forum.Models.Forum)e.Item.DataItem;
                 Literal _title = (Literal)e.Item.FindControl("lt_titel");
                 Literal _desc = (Literal)e.Item.FindControl("lt_desc");
                 Literal _link = (Literal)e.Item.FindControl("lt_link");
@@ -147,11 +142,11 @@ namespace our.usercontrols {
                     fnode.Save();
                     umbraco.library.UpdateDocumentCache(fnode.Id);
 
-                    Forum f = _forumService.GetById(fnode.Id);
+                    Forum.Models.Forum f = _forumService.GetById(fnode.Id);
 
                     if (f == null)
                     {
-                        f = new Forum();
+                        f = new Forum.Models.Forum();
                         f.Id = fnode.Id;
                         f.ParentId = fnode.ParentId;
                         f.SortOrder = 0;
diff --git a/OurUmbraco/Our/usercontrols/ProjectForums.ascx.designer.cs b/OurUmbraco/Our/usercontrols/ProjectForums.ascx.designer.cs
index e4536903..6ee4fd0e 100644
--- a/OurUmbraco/Our/usercontrols/ProjectForums.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/ProjectForums.ascx.designer.cs
@@ -1,14 +1,13 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class ProjectForums {
diff --git a/OurUmbraco/Our/usercontrols/Signup.ascx b/OurUmbraco/Our/usercontrols/Signup.ascx
index 19ae5b2e..652afe2d 100644
--- a/OurUmbraco/Our/usercontrols/Signup.ascx
+++ b/OurUmbraco/Our/usercontrols/Signup.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Signup.ascx.cs" Inherits="our.usercontrols.Signup" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Signup.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.Signup" %>
 
 <asp:panel ID="MemberExists" Visible="False" runat="server">
     <p>There is already an account with this e-mail address! You can <a href="/member/login">login</a> or <a href="/member/forgot-password">reset your password</a>.</p>
diff --git a/OurUmbraco/Our/usercontrols/Signup.ascx.cs b/OurUmbraco/Our/usercontrols/Signup.ascx.cs
index 934e1bbf..239f9746 100644
--- a/OurUmbraco/Our/usercontrols/Signup.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/Signup.ascx.cs
@@ -11,7 +11,7 @@ using Umbraco.Web;
 using File = System.IO.File;
 using UmbracoUserControl = Umbraco.Web.UI.Controls.UmbracoUserControl;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class Signup : UmbracoUserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/Signup.ascx.designer.cs b/OurUmbraco/Our/usercontrols/Signup.ascx.designer.cs
index 77dc318b..2a88a4ee 100644
--- a/OurUmbraco/Our/usercontrols/Signup.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/Signup.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class Signup {
diff --git a/OurUmbraco/Our/usercontrols/SignupSimple.ascx b/OurUmbraco/Our/usercontrols/SignupSimple.ascx
index a2b48b89..e2bd8652 100644
--- a/OurUmbraco/Our/usercontrols/SignupSimple.ascx
+++ b/OurUmbraco/Our/usercontrols/SignupSimple.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SignupSimple.ascx.cs" Inherits="our.usercontrols.SignupSimple" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SignupSimple.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.SignupSimple" %>
 
 
 <asp:panel ID="Panel1" runat="server" defaultbutton="bt_submit">
diff --git a/OurUmbraco/Our/usercontrols/SignupSimple.ascx.cs b/OurUmbraco/Our/usercontrols/SignupSimple.ascx.cs
index 5d01106e..eb85bd73 100644
--- a/OurUmbraco/Our/usercontrols/SignupSimple.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/SignupSimple.ascx.cs
@@ -1,12 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
 using umbraco.cms.businesslogic.member;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class SignupSimple : System.Web.UI.UserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/SignupSimple.ascx.designer.cs b/OurUmbraco/Our/usercontrols/SignupSimple.ascx.designer.cs
index 6bea4aaa..e1978c02 100644
--- a/OurUmbraco/Our/usercontrols/SignupSimple.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/SignupSimple.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class SignupSimple {
diff --git a/OurUmbraco/Our/usercontrols/acceptTos.ascx b/OurUmbraco/Our/usercontrols/acceptTos.ascx
index 07b06f7a..0acec44c 100644
--- a/OurUmbraco/Our/usercontrols/acceptTos.ascx
+++ b/OurUmbraco/Our/usercontrols/acceptTos.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="acceptTos.ascx.cs" Inherits="our.usercontrols.acceptTos" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="acceptTos.ascx.cs" Inherits="OurUmbraco.Our.usercontrols.acceptTos" %>
 <asp:PlaceHolder ID="error" runat="server" Visible="false">
 <div class="error">You need to accept the ToS!</div>
 </asp:PlaceHolder>
diff --git a/OurUmbraco/Our/usercontrols/acceptTos.ascx.cs b/OurUmbraco/Our/usercontrols/acceptTos.ascx.cs
index b6d91eb7..a7466f9b 100644
--- a/OurUmbraco/Our/usercontrols/acceptTos.ascx.cs
+++ b/OurUmbraco/Our/usercontrols/acceptTos.ascx.cs
@@ -1,12 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
 using umbraco.cms.businesslogic.member;
 
-namespace our.usercontrols
+namespace OurUmbraco.Our.usercontrols
 {
     public partial class acceptTos : System.Web.UI.UserControl
     {
diff --git a/OurUmbraco/Our/usercontrols/acceptTos.ascx.designer.cs b/OurUmbraco/Our/usercontrols/acceptTos.ascx.designer.cs
index 01471f89..a17e1c60 100644
--- a/OurUmbraco/Our/usercontrols/acceptTos.ascx.designer.cs
+++ b/OurUmbraco/Our/usercontrols/acceptTos.ascx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace our.usercontrols {
+namespace OurUmbraco.Our.usercontrols {
     
     
     public partial class acceptTos {