Moves some namespaces around so that it's a bit more nicely organized

OurUmbraco.Site/Views/MacroPartials/Forum/Forum.cshtml

@@ -1,4 +1,5 @@
 @using uForum
+@using uForum.Extensions
 @using uForum.Library
 @using uForum.Models
 @using uForum.Services

OurUmbraco.Site/Views/MacroPartials/Forum/LatestActivity.cshtml

@@ -1,5 +1,6 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @using uForum;
+@using uForum.Extensions
 
 @{
     var ts = new uForum.Services.TopicService(ApplicationContext.DatabaseContext);

OurUmbraco.Site/Views/MacroPartials/Forum/TopicActions.cshtml

@@ -1,4 +1,5 @@
 @using uForum
+@using uForum.Extensions
 @using uForum.Services
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @{

OurUmbraco.Site/Views/MacroPartials/Members/HeaderProfile.cshtml

@@ -1,5 +1,6 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @using uForum;
+@using uForum.Extensions
 
 @if(Members.IsLoggedIn()){
     <div class="user">

OurUmbraco.Site/Views/MacroPartials/Members/JsValues.cshtml

@@ -1,5 +1,6 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @using uForum;
+@using uForum.Extensions
 
 @if(Members.IsLoggedIn()){
 

OurUmbraco.Site/Views/MacroPartials/Members/PublicProfile.cshtml

@@ -2,6 +2,7 @@
 @using Marketplace.Interfaces
 @using Marketplace.Providers
 @using uForum;
+@using uForum.Extensions
 @{
     var memberId = Request["id"];
     int id = 0;

OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml

@@ -2,6 +2,7 @@
 @using System.Drawing
 @using our
 @using uForum
+@using uForum.Extensions
 @using uForum.Services
 @{
     var topicService = new TopicService(ApplicationContext.DatabaseContext);

OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml

@@ -1,6 +1,7 @@
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @using our.Controllers
 @using uForum;
+@using uForum.Extensions
 @using uProject.Controllers
 
 @{

OurUmbraco.Site/Views/MacroPartials/Rss/Forum.cshtml

@@ -1,4 +1,5 @@
 @using uForum
+@using uForum.Extensions
 @using uForum.Services
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @{

OurUmbraco.Site/Views/MacroPartials/Rss/LatestTopics.cshtml

@@ -1,4 +1,5 @@
 @using uForum
+@using uForum.Extensions
 @using uForum.Services
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @{

OurUmbraco.Site/Views/MacroPartials/Rss/Packages.cshtml

@@ -1,4 +1,5 @@
 @using uForum
+@using uForum.Extensions
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @{
     Response.Clear();

OurUmbraco.Site/Views/MacroPartials/Rss/Participated.cshtml

@@ -1,4 +1,5 @@
 @using uForum
+@using uForum.Extensions
 @using uForum.Services
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @{

OurUmbraco.Site/Views/MacroPartials/Rss/Topic.cshtml

@@ -1,4 +1,5 @@
 @using uForum
+@using uForum.Extensions
 @using uForum.Services
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 @{

OurUmbraco.Site/Views/Partials/Forum/Comment.cshtml

@@ -1,5 +1,6 @@
 @inherits UmbracoViewPage<uForum.Models.ReadOnlyComment>
 @using uForum;
+@using uForum.Extensions
 
 @{
     var currentMember = Members.GetCurrentMember();

OurUmbraco.Site/Views/Partials/Forum/MemberBadge.cshtml

@@ -1,5 +1,6 @@
 @model IMember
 @using uForum;
+@using uForum.Extensions
 
 <div class="author vcard">
     <div class="memberBadge rounded">

OurUmbraco.Site/Views/Partials/Forum/Question.cshtml

@@ -1,5 +1,6 @@
 @inherits Umbraco.Web.Mvc.UmbracoViewPage<uForum.Models.Topic>
 @using uForum;
+@using uForum.Extensions
 
 @{
     var topicAuthor = Members.GetById(Model.MemberId);

our.umbraco.org/Api/CommunityController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Web.Http;
 using System.Xml;
 using our.Businesslogic;
-using our.Rest;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.member;
 using umbraco.cms.businesslogic.web;

our.umbraco.org/Api/SearchController.cs

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Lucene.Net.Documents;
 using our.Models;
 using uForum;
+using uForum.Extensions;
 using Umbraco.Web.WebApi;
 
 namespace our.Api

our.umbraco.org/CustomHandlers/ForumPostsCounter.cs

@@ -1,4 +1,5 @@
 using uForum;
+using uForum.Extensions;
 using uForum.Services;
 using Umbraco.Core;
 using Umbraco.Web;

our.umbraco.org/Rest.cs

@@ -1,18 +1,11 @@
-using System;
-using System.Linq;
-using System.Web;
-using System.Xml.XPath;
-using umbraco.cms.businesslogic.member;
-using System.IO;
-using System.Drawing;
-using System.Xml;
-using umbraco.BusinessLogic;
-using umbraco.cms.businesslogic.web;
-using our.Businesslogic;
+using System.Web;
 using System.Web.Security;
+using System.Xml.XPath;
+using umbraco.BusinessLogic;
+using umbraco.cms.businesslogic.member;
 using Umbraco.Web.BaseRest;
 
-namespace our.Rest
+namespace our
 {
     /// <summary>
     /// Our mighty utill classes for looking stuff up quickly...

our.umbraco.org/usercontrols/EventEditor.ascx.cs

@@ -5,6 +5,7 @@ using System.Web.UI;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using System.Net.Mail;
+using uEvents.Relations;
 using umbraco.BusinessLogic;
 using Umbraco.Web;
 using Member = umbraco.cms.businesslogic.member.Member;
@@ -97,7 +98,7 @@ namespace our.usercontrols
 
                     if (sync)
                     {
-                        var ev = new uEvents.Event(publishedContent);
+                        var ev = new Event(publishedContent);
                         ev.syncCapacity();
                     }
                 }

our.umbraco.org/usercontrols/Signup.ascx.cs

@@ -2,7 +2,6 @@
 using System.Configuration;
 using System.Web.UI;
 using System.Xml;
-using our.Rest;
 using umbraco;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.member;

uEvents/Api/EventsController.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Web.Http;
 using System.Xml.XPath;
 using uEvents.Meetup;
+using uEvents.Relations;
 using umbraco;
 using umbraco.cms.businesslogic.cache;
 using umbraco.cms.businesslogic.member;

uEvents/App_Startup/ControllerRouting.cs

@@ -1,9 +1,10 @@
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
+using uEvents.App_Startup;
 
-[assembly: PreApplicationStartMethod(typeof(uEvents.App_Start.ControllerRouting), "Setup")]
-namespace uEvents.App_Start
+[assembly: PreApplicationStartMethod(typeof(ControllerRouting), "Setup")]
+namespace uEvents.App_Startup
 {
     public class ControllerRouting
     {

uEvents/Library/Xslt.cs

@@ -6,6 +6,7 @@ using System.Xml.XPath;
 using umbraco.cms.businesslogic.web;
 using umbraco.DataLayer;
 using System.Xml;
+using uEvents.Relations;
 
 namespace uEvents.Library
 {

uEvents/Relations/Event.cs

@@ -1,11 +1,10 @@
-using System.Linq;
+using umbraco.BusinessLogic;
 using Umbraco.Core.Models;
-using umbraco.BusinessLogic;
 using Umbraco.Web;
 using Relation = umbraco.cms.businesslogic.relation.Relation;
 using RelationType = umbraco.cms.businesslogic.relation.RelationType;
 
-namespace uEvents
+namespace uEvents.Relations
 {
     public class Event
     {

uForum/AntiSpam/SpamChecker.cs

@@ -9,6 +9,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Web;
+using uForum.Extensions;
 using uForum.Library;
 using uForum.Models;
 using uForum.Services;

uForum/Api/ForumController.cs

@@ -10,6 +10,7 @@ using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web.Http;
+using uForum.Extensions;
 using uForum.Models;
 using uForum.Services;
 using Umbraco.Core.Services;

uForum/Api/PublicForumController.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web.Http;
+using uForum.Extensions;
 using uForum.Services;
 using Umbraco.Core.Models;
 using Umbraco.Web.WebApi;

uForum/EventHandlers/NewForumHandler.cs

@@ -1,63 +1,61 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using uForum.Models;
-using uForum.Services;
-using Umbraco.Core;
-using Umbraco.Core.Services;
-
-namespace uForum
-{
-    public class NewForumHandler : ApplicationEventHandler
-    {
-
-        /// <summary>
-        ///  This handler creates a forum entry in the forumForums table
-        ///  When a forum node is created in the content tree, all forums are connected to a node
-        /// </summary>
-        /// <param name="umbracoApplication"></param>
-        /// <param name="applicationContext"></param>
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            ContentService.Published += ContentService_Published;
-            ContentService.Deleted += ContentService_Deleted;
-        }
-
-        void ContentService_Deleted(IContentService sender, Umbraco.Core.Events.DeleteEventArgs<Umbraco.Core.Models.IContent> e)
-        {
-            var fs = new ForumService(ApplicationContext.Current.DatabaseContext);
-            foreach (var ent in e.DeletedEntities.Where(x => x.ContentType.Alias == "Forum"))
-            {
-
-                var f = fs.GetById(ent.Id);
-                if (f != null)
-                    fs.Delete(f);
-            }
-        }
-
-        void ContentService_Published(Umbraco.Core.Publishing.IPublishingStrategy sender, Umbraco.Core.Events.PublishEventArgs<Umbraco.Core.Models.IContent> e)
-        {
-            var fs = new ForumService(ApplicationContext.Current.DatabaseContext);
-            foreach (var ent in e.PublishedEntities.Where(x => x.ContentType.Alias == "Forum"))
-            {
-                Forum f = fs.GetById(ent.Id);
-
-                if (f == null)
-                {
-                    f = new Forum();
-                    f.Id = ent.Id;
-                    f.ParentId = ent.ParentId;
-                    f.SortOrder = ent.SortOrder;
-                    f.TotalTopics = 0;
-                    f.TotalComments = 0;
-                    f.LatestPostDate = DateTime.Now;
-                    f.LatestAuthor = 0;
-                    f.LatestComment = 0;
-                    f.LatestTopic = 0;
-                    fs.Save(f);
-                }
-            }
-        }
-    }
-}
+using System;
+using System.Linq;
+using uForum.Models;
+using uForum.Services;
+using Umbraco.Core;
+using Umbraco.Core.Services;
+
+namespace uForum.EventHandlers
+{
+    public class NewForumHandler : ApplicationEventHandler
+    {
+
+        /// <summary>
+        ///  This handler creates a forum entry in the forumForums table
+        ///  When a forum node is created in the content tree, all forums are connected to a node
+        /// </summary>
+        /// <param name="umbracoApplication"></param>
+        /// <param name="applicationContext"></param>
+        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+            ContentService.Published += ContentService_Published;
+            ContentService.Deleted += ContentService_Deleted;
+        }
+
+        void ContentService_Deleted(IContentService sender, Umbraco.Core.Events.DeleteEventArgs<Umbraco.Core.Models.IContent> e)
+        {
+            var fs = new ForumService(ApplicationContext.Current.DatabaseContext);
+            foreach (var ent in e.DeletedEntities.Where(x => x.ContentType.Alias == "Forum"))
+            {
+
+                var f = fs.GetById(ent.Id);
+                if (f != null)
+                    fs.Delete(f);
+            }
+        }
+
+        void ContentService_Published(Umbraco.Core.Publishing.IPublishingStrategy sender, Umbraco.Core.Events.PublishEventArgs<Umbraco.Core.Models.IContent> e)
+        {
+            var fs = new ForumService(ApplicationContext.Current.DatabaseContext);
+            foreach (var ent in e.PublishedEntities.Where(x => x.ContentType.Alias == "Forum"))
+            {
+                Forum f = fs.GetById(ent.Id);
+
+                if (f == null)
+                {
+                    f = new Forum();
+                    f.Id = ent.Id;
+                    f.ParentId = ent.ParentId;
+                    f.SortOrder = ent.SortOrder;
+                    f.TotalTopics = 0;
+                    f.TotalComments = 0;
+                    f.LatestPostDate = DateTime.Now;
+                    f.LatestAuthor = 0;
+                    f.LatestComment = 0;
+                    f.LatestTopic = 0;
+                    fs.Save(f);
+                }
+            }
+        }
+    }
+}

uForum/Extensions/EventExtensions.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace uForum
+namespace uForum.Extensions
 {
         public static class EventExtensions
         {

uForum/Extensions/ForumExtensions.cs

@@ -1,17 +1,15 @@
 using System;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Web;
 using HtmlAgilityPack;
-using ImageProcessor.Imaging.Filters.Artistic;
 using MarkdownSharp;
 using uForum.AntiSpam;
 using uForum.Library;
 using uForum.Models;
 using Umbraco.Web;
 
-namespace uForum
+namespace uForum.Extensions
 {
     public static class ForumExtensions
     {

uForum/Extensions/MemberForumExtensions.cs

@@ -4,7 +4,7 @@ using Umbraco.Core.Models;
 using Umbraco.Web;
 using Umbraco.Web.Security;
 
-namespace uForum
+namespace uForum.Extensions
 {
     public static class MemberForumExtensions
     {

uForum/Services/CommentService.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using uForum.Extensions;
 using uForum.Models;
 using Umbraco.Core;
 using Umbraco.Core.Persistence;

uForum/Services/ForumService.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using uForum.Extensions;
 using uForum.Models;
 using Umbraco.Core;
 using Umbraco.Core.Persistence;

uForum/Services/TopicService.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web;
+using uForum.Extensions;
 using uForum.Models;
 using Umbraco.Core;
 using Umbraco.Core.Cache;

uForum/uForum.csproj

@@ -256,14 +256,14 @@
     <Compile Include="Api\ForumControllerBase.cs" />
     <Compile Include="Api\PublicForumController.cs" />
     <Compile Include="Api\TopicController.cs" />
-    <Compile Include="EventExtensions.cs" />
+    <Compile Include="Extensions\EventExtensions.cs" />
     <Compile Include="Events.cs" />
-    <Compile Include="ForumExtensions.cs" />
+    <Compile Include="Extensions\ForumExtensions.cs" />
     <Compile Include="iNotFoundHandler.cs" />
     <Compile Include="Library\Utils.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MemberForumExtensions.cs" />
+    <Compile Include="Extensions\MemberForumExtensions.cs" />
     <Compile Include="Models\Comment.cs" />
     <Compile Include="Models\CommentSaveModel.cs" />
     <Compile Include="Models\Forum.cs" />
@@ -272,7 +272,7 @@
     <Compile Include="Models\Topic.cs" />
     <Compile Include="Models\TopicCommentRelator.cs" />
     <Compile Include="Models\TopicSaveModel.cs" />
-    <Compile Include="NewForumHandler.cs" />
+    <Compile Include="EventHandlers\NewForumHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\CommentService.cs" />
     <Compile Include="Services\ForumService.cs" />

uPowers/Buddha/Buddha.cs

@@ -1,20 +1,9 @@
 using System;
-using System.Data;
-using System.Configuration;
-using System.Linq;
-using System.Web;
-using System.Web.Security;
-using System.Web.UI;
-using System.Web.UI.HtmlControls;
-using System.Web.UI.WebControls;
-using System.Web.UI.WebControls.WebParts;
-using System.Xml.Linq;
-using System.Xml;
-using System.Data.SqlClient;
 using System.IO;
+using System.Xml;
 using umbraco.DataLayer;
 
-namespace uPowers
+namespace uPowers.Buddha
 {
     public class Buddha : IDisposable
     {

uPowers/Library/xslt.cs

@@ -11,7 +11,7 @@ namespace uPowers.Library {
 
         //this will be changed to something abit less static before Upowers are released, if it ever is...
         public static XPathNodeIterator MemberKarma(int InLastNumberOfDays, int maxItems) {
-            string SQL = Buddha.TotalKarmaSQL(InLastNumberOfDays, maxItems);
+            string SQL = Buddha.Buddha.TotalKarmaSQL(InLastNumberOfDays, maxItems);
             return uPowers.BusinessLogic.Data.GetDataSet(SQL, "score");
         }
         

uRelease/App_Start/ControllerRouting.cs

@@ -1,9 +1,10 @@
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
+using uRelease;
 
-[assembly: PreApplicationStartMethod(typeof(uRelease.App_Start.ControllerRouting), "Setup")]
-namespace uRelease.App_Start
+[assembly: PreApplicationStartMethod(typeof(ControllerRouting), "Setup")]
+namespace uRelease
 {
     public class ControllerRouting
     {