diff --git a/OurUmbraco.Site/ErrorHandler/AiHandleErrorAttribute.cs b/OurUmbraco.Site/ErrorHandler/AiHandleErrorAttribute.cs
deleted file mode 100644
index c91bf25b..00000000
--- a/OurUmbraco.Site/ErrorHandler/AiHandleErrorAttribute.cs
+++ /dev/null
@@ -1 +0,0 @@
-using System;
using System.Web.Mvc;
using Microsoft.ApplicationInsights;

namespace OurUmbraco.Site.ErrorHandler
{
    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)] 
    public class AiHandleErrorAttribute : HandleErrorAttribute
    {
        public override void OnException(ExceptionContext filterContext)
        {
            if (filterContext != null && filterContext.HttpContext != null && filterContext.Exception != null)
            {
                //If customError is Off, then AI HTTPModule will report the exception
                if (filterContext.HttpContext.IsCustomErrorEnabled)
                {   
                    var ai = new TelemetryClient();
                    ai.TrackException(filterContext.Exception);
                } 
            }
            base.OnException(filterContext);
        }
    }
}
\ No newline at end of file
diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj
index a8728c38..c296d451 100644
--- a/OurUmbraco.Site/OurUmbraco.Site.csproj
+++ b/OurUmbraco.Site/OurUmbraco.Site.csproj
@@ -410,8 +410,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ErrorHandler\AiHandleErrorAttribute.cs" />
-    <Compile Include="FilterConfig.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Views\Search\Search.aspx.cs">
       <DependentUpon>Search.aspx</DependentUpon>
diff --git a/OurUmbraco/Our/CustomHandlers/OurApplicationStartupHandler.cs b/OurUmbraco/Our/CustomHandlers/OurApplicationStartupHandler.cs
index 0f0af808..c39cd9bb 100644
--- a/OurUmbraco/Our/CustomHandlers/OurApplicationStartupHandler.cs
+++ b/OurUmbraco/Our/CustomHandlers/OurApplicationStartupHandler.cs
@@ -7,7 +7,6 @@ using OurUmbraco.Documentation.Busineslogic.GithubSourcePull;
 using OurUmbraco.Our.Examine;
 using Umbraco.Core;
 using Umbraco.Web;
-using Umbraco.Web.Routing;
 
 namespace OurUmbraco.Our.CustomHandlers
 {
@@ -22,6 +21,7 @@ namespace OurUmbraco.Our.CustomHandlers
             CreateRoutes();
             BindExamineEvents();
             ZipDownloader.OnFinish += ZipDownloader_OnFinish;
+            FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
         }
 
         private void CreateRoutes()
diff --git a/OurUmbraco/Our/ErrorHandler/AiHandleErrorAttribute.cs b/OurUmbraco/Our/ErrorHandler/AiHandleErrorAttribute.cs
new file mode 100644
index 00000000..d11de830
--- /dev/null
+++ b/OurUmbraco/Our/ErrorHandler/AiHandleErrorAttribute.cs
@@ -0,0 +1 @@
+using System;
using System.Web.Mvc;
using Microsoft.ApplicationInsights;

namespace OurUmbraco.Our.ErrorHandler
{
    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)] 
    public class AiHandleErrorAttribute : HandleErrorAttribute
    {
        public override void OnException(ExceptionContext filterContext)
        {
            if (filterContext != null && filterContext.HttpContext != null && filterContext.Exception != null)
            {
                //If customError is Off, then AI HTTPModule will report the exception
                if (filterContext.HttpContext.IsCustomErrorEnabled)
                {   
                    var ai = new TelemetryClient();
                    ai.TrackException(filterContext.Exception);
                } 
            }
            base.OnException(filterContext);
        }
    }
}
\ No newline at end of file
diff --git a/OurUmbraco.Site/FilterConfig.cs b/OurUmbraco/Our/FilterConfig.cs
similarity index 58%
rename from OurUmbraco.Site/FilterConfig.cs
rename to OurUmbraco/Our/FilterConfig.cs
index 8c6eefbe..e028d249 100644
--- a/OurUmbraco.Site/FilterConfig.cs
+++ b/OurUmbraco/Our/FilterConfig.cs
@@ -1,11 +1,13 @@
 using System.Web.Mvc;
+using OurUmbraco.Our.ErrorHandler;
 
-namespace OurUmbraco.Site{
+namespace OurUmbraco.Our
+{
     public class FilterConfig
     {
         public static void RegisterGlobalFilters(GlobalFilterCollection filters)
         {
-            filters.Add(new ErrorHandler.AiHandleErrorAttribute());
+            filters.Add(new AiHandleErrorAttribute());
         }
     }
 }
\ No newline at end of file
diff --git a/OurUmbraco/OurUmbraco.csproj b/OurUmbraco/OurUmbraco.csproj
index fdc568a8..d95d5321 100644
--- a/OurUmbraco/OurUmbraco.csproj
+++ b/OurUmbraco/OurUmbraco.csproj
@@ -527,6 +527,7 @@
     <Compile Include="Our\CustomHandlers\SearchPageRouteHandler.cs" />
     <Compile Include="Our\CustomHandlers\TopicVote.cs" />
     <Compile Include="Our\DefaultMemberAvatarHandler.cs" />
+    <Compile Include="Our\ErrorHandler\AiHandleErrorAttribute.cs" />
     <Compile Include="Our\Examine\DocumentationIndexConfig.cs" />
     <Compile Include="Our\Examine\DocumentationIndexDataService.cs" />
     <Compile Include="Our\Examine\ExamineHelper.cs" />
@@ -538,6 +539,7 @@
     <Compile Include="Our\Examine\SearchFilter.cs" />
     <Compile Include="Our\Examine\SearchFilters.cs" />
     <Compile Include="Our\Extensions\StringExtensions.cs" />
+    <Compile Include="Our\FilterConfig.cs" />
     <Compile Include="Our\GoogleOAuth\UmbracoAuthTokenServerExtensions.cs" />
     <Compile Include="Our\GoogleOAuth\UmbracoCustomOwinStartup.cs" />
     <Compile Include="Our\GoogleOAuth\UmbracoGoogleAuthExtensions.cs" />