diff --git a/src/Squidex/Areas/Api/ControllerBase.cs b/src/Squidex/Areas/Api/ApiController.cs
similarity index 72%
rename from src/Squidex/Areas/Api/ControllerBase.cs
rename to src/Squidex/Areas/Api/ApiController.cs
index dc1fdd26f..1e408c113 100644
--- a/src/Squidex/Areas/Api/ControllerBase.cs
+++ b/src/Squidex/Areas/Api/ApiController.cs
@@ -8,14 +8,15 @@
 
 using System;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Squidex.Domain.Apps.Read.Apps;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers
+namespace Squidex.Areas.Api.Controllers
 {
-    public abstract class ControllerBase : Controller
+    public abstract class ApiController : Controller
     {
         protected ICommandBus CommandBus { get; }
 
@@ -39,11 +40,19 @@ namespace Squidex.Controllers
             get { return App.Name; }
         }
 
-        protected ControllerBase(ICommandBus commandBus)
+        protected ApiController(ICommandBus commandBus)
         {
             Guard.NotNull(commandBus, nameof(commandBus));
 
             CommandBus = commandBus;
         }
+
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            if (!context.HttpContext.Request.PathBase.StartsWithSegments("/api"))
+            {
+                context.Result = new NotFoundResult();
+            }
+        }
     }
 }
diff --git a/src/Squidex/Areas/Api/Apps/AppClientsController.cs b/src/Squidex/Areas/Api/Apps/AppClientsController.cs
index ed388de82..7246417e5 100644
--- a/src/Squidex/Areas/Api/Apps/AppClientsController.cs
+++ b/src/Squidex/Areas/Api/Apps/AppClientsController.cs
@@ -11,13 +11,13 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Apps.Models;
+using Squidex.Areas.Api.Controllers.Apps.Models;
 using Squidex.Domain.Apps.Write.Apps.Commands;
 using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Apps
+namespace Squidex.Areas.Api.Controllers.Apps
 {
     /// <summary>
     /// Manages and configures apps.
@@ -27,7 +27,7 @@ namespace Squidex.Controllers.Api.Apps
     [AppApi]
     [MustBeAppOwner]
     [SwaggerTag(nameof(Apps))]
-    public sealed class AppClientsController : ControllerBase
+    public sealed class AppClientsController : ApiController
     {
         public AppClientsController(ICommandBus commandBus)
             : base(commandBus)
diff --git a/src/Squidex/Areas/Api/Apps/AppContributorsController.cs b/src/Squidex/Areas/Api/Apps/AppContributorsController.cs
index b6acd8d12..79830a43b 100644
--- a/src/Squidex/Areas/Api/Apps/AppContributorsController.cs
+++ b/src/Squidex/Areas/Api/Apps/AppContributorsController.cs
@@ -11,14 +11,14 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Apps.Models;
+using Squidex.Areas.Api.Controllers.Apps.Models;
 using Squidex.Domain.Apps.Read.Apps.Services;
 using Squidex.Domain.Apps.Write.Apps.Commands;
 using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Apps
+namespace Squidex.Areas.Api.Controllers.Apps
 {
     /// <summary>
     /// Manages and configures apps.
@@ -28,7 +28,7 @@ namespace Squidex.Controllers.Api.Apps
     [AppApi]
     [MustBeAppOwner]
     [SwaggerTag(nameof(Apps))]
-    public sealed class AppContributorsController : ControllerBase
+    public sealed class AppContributorsController : ApiController
     {
         private readonly IAppPlansProvider appPlansProvider;
 
diff --git a/src/Squidex/Areas/Api/Apps/AppLanguagesController.cs b/src/Squidex/Areas/Api/Apps/AppLanguagesController.cs
index 4d0ee698a..f33e1288b 100644
--- a/src/Squidex/Areas/Api/Apps/AppLanguagesController.cs
+++ b/src/Squidex/Areas/Api/Apps/AppLanguagesController.cs
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Apps.Models;
+using Squidex.Areas.Api.Controllers.Apps.Models;
 using Squidex.Domain.Apps.Core.Apps;
 using Squidex.Domain.Apps.Write.Apps.Commands;
 using Squidex.Infrastructure;
@@ -21,7 +21,7 @@ using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Apps
+namespace Squidex.Areas.Api.Controllers.Apps
 {
     /// <summary>
     /// Manages and configures apps.
@@ -30,7 +30,7 @@ namespace Squidex.Controllers.Api.Apps
     [ApiExceptionFilter]
     [AppApi]
     [SwaggerTag(nameof(Apps))]
-    public sealed class AppLanguagesController : ControllerBase
+    public sealed class AppLanguagesController : ApiController
     {
         public AppLanguagesController(ICommandBus commandBus)
             : base(commandBus)
diff --git a/src/Squidex/Areas/Api/Apps/AppsController.cs b/src/Squidex/Areas/Api/Apps/AppsController.cs
index e101b85af..5b8c2d6c5 100644
--- a/src/Squidex/Areas/Api/Apps/AppsController.cs
+++ b/src/Squidex/Areas/Api/Apps/AppsController.cs
@@ -11,7 +11,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Apps.Models;
+using Squidex.Areas.Api.Controllers.Apps.Models;
 using Squidex.Domain.Apps.Core.Apps;
 using Squidex.Domain.Apps.Read;
 using Squidex.Domain.Apps.Read.Apps.Services;
@@ -21,7 +21,7 @@ using Squidex.Infrastructure.Reflection;
 using Squidex.Infrastructure.Security;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Apps
+namespace Squidex.Areas.Api.Controllers.Apps
 {
     /// <summary>
     /// Manages and configures apps.
@@ -29,7 +29,7 @@ namespace Squidex.Controllers.Api.Apps
     [ApiAuthorize]
     [ApiExceptionFilter]
     [SwaggerTag(nameof(Apps))]
-    public sealed class AppsController : ControllerBase
+    public sealed class AppsController : ApiController
     {
         private readonly IAppProvider appProvider;
         private readonly IAppPlansProvider appPlansProvider;
diff --git a/src/Squidex/Areas/Api/Apps/Models/AddAppLanguageDto.cs b/src/Squidex/Areas/Api/Apps/Models/AddAppLanguageDto.cs
index d604c8aac..fc1a928ba 100644
--- a/src/Squidex/Areas/Api/Apps/Models/AddAppLanguageDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/AddAppLanguageDto.cs
@@ -9,7 +9,7 @@
 using System.ComponentModel.DataAnnotations;
 using Squidex.Infrastructure;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class AddAppLanguageDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/AppCreatedDto.cs b/src/Squidex/Areas/Api/Apps/Models/AppCreatedDto.cs
index 90c191755..30b3de2c9 100644
--- a/src/Squidex/Areas/Api/Apps/Models/AppCreatedDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/AppCreatedDto.cs
@@ -11,7 +11,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Squidex.Domain.Apps.Core.Apps;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class AppCreatedDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/AppDto.cs b/src/Squidex/Areas/Api/Apps/Models/AppDto.cs
index f48917dae..dbc6e513e 100644
--- a/src/Squidex/Areas/Api/Apps/Models/AppDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/AppDto.cs
@@ -13,7 +13,7 @@ using Newtonsoft.Json.Converters;
 using NodaTime;
 using Squidex.Domain.Apps.Core.Apps;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class AppDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/AppLanguageDto.cs b/src/Squidex/Areas/Api/Apps/Models/AppLanguageDto.cs
index 40ff4771c..90a9699af 100644
--- a/src/Squidex/Areas/Api/Apps/Models/AppLanguageDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/AppLanguageDto.cs
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Squidex.Infrastructure;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class AppLanguageDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/AssignAppContributorDto.cs b/src/Squidex/Areas/Api/Apps/Models/AssignAppContributorDto.cs
index 9f2480ddd..8083dd614 100644
--- a/src/Squidex/Areas/Api/Apps/Models/AssignAppContributorDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/AssignAppContributorDto.cs
@@ -11,7 +11,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Squidex.Domain.Apps.Core.Apps;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class AssignAppContributorDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/ClientDto.cs b/src/Squidex/Areas/Api/Apps/Models/ClientDto.cs
index 90f74e701..059ee5918 100644
--- a/src/Squidex/Areas/Api/Apps/Models/ClientDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/ClientDto.cs
@@ -11,7 +11,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Squidex.Domain.Apps.Core.Apps;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class ClientDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/ContributorDto.cs b/src/Squidex/Areas/Api/Apps/Models/ContributorDto.cs
index dd5bed79b..1892bfb29 100644
--- a/src/Squidex/Areas/Api/Apps/Models/ContributorDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/ContributorDto.cs
@@ -11,7 +11,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Squidex.Domain.Apps.Core.Apps;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class ContributorDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/ContributorsDto.cs b/src/Squidex/Areas/Api/Apps/Models/ContributorsDto.cs
index cd542674b..08bd5e252 100644
--- a/src/Squidex/Areas/Api/Apps/Models/ContributorsDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/ContributorsDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class ContributorsDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/CreateAppClientDto.cs b/src/Squidex/Areas/Api/Apps/Models/CreateAppClientDto.cs
index 91ccf179f..c6df27c98 100644
--- a/src/Squidex/Areas/Api/Apps/Models/CreateAppClientDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/CreateAppClientDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class CreateAppClientDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/CreateAppDto.cs b/src/Squidex/Areas/Api/Apps/Models/CreateAppDto.cs
index f9b0ab99d..61361ea8b 100644
--- a/src/Squidex/Areas/Api/Apps/Models/CreateAppDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/CreateAppDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class CreateAppDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/UpdateAppClientDto.cs b/src/Squidex/Areas/Api/Apps/Models/UpdateAppClientDto.cs
index 2140f52ef..02b718bdf 100644
--- a/src/Squidex/Areas/Api/Apps/Models/UpdateAppClientDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/UpdateAppClientDto.cs
@@ -11,7 +11,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Squidex.Domain.Apps.Core.Apps;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class UpdateAppClientDto
     {
diff --git a/src/Squidex/Areas/Api/Apps/Models/UpdateAppLanguageDto.cs b/src/Squidex/Areas/Api/Apps/Models/UpdateAppLanguageDto.cs
index d2d21cc52..05454fbe6 100644
--- a/src/Squidex/Areas/Api/Apps/Models/UpdateAppLanguageDto.cs
+++ b/src/Squidex/Areas/Api/Apps/Models/UpdateAppLanguageDto.cs
@@ -9,7 +9,7 @@
 using System.Collections.Generic;
 using Squidex.Infrastructure;
 
-namespace Squidex.Controllers.Api.Apps.Models
+namespace Squidex.Areas.Api.Controllers.Apps.Models
 {
     public sealed class UpdateAppLanguageDto
     {
diff --git a/src/Squidex/Areas/Api/Assets/AssetConfig.cs b/src/Squidex/Areas/Api/Assets/AssetConfig.cs
index 1e4ec5a14..37a9b72f4 100644
--- a/src/Squidex/Areas/Api/Assets/AssetConfig.cs
+++ b/src/Squidex/Areas/Api/Assets/AssetConfig.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.Assets
+namespace Squidex.Areas.Api.Controllers.Assets
 {
     public sealed class AssetConfig
     {
diff --git a/src/Squidex/Areas/Api/Assets/AssetContentController.cs b/src/Squidex/Areas/Api/Assets/AssetContentController.cs
index daec1cdd4..69146ece2 100644
--- a/src/Squidex/Areas/Api/Assets/AssetContentController.cs
+++ b/src/Squidex/Areas/Api/Assets/AssetContentController.cs
@@ -18,7 +18,7 @@ using Squidex.Pipeline;
 
 #pragma warning disable 1573
 
-namespace Squidex.Controllers.Api.Assets
+namespace Squidex.Areas.Api.Controllers.Assets
 {
     /// <summary>
     /// Uploads and retrieves assets.
@@ -26,7 +26,7 @@ namespace Squidex.Controllers.Api.Assets
     [ApiExceptionFilter]
     [AppApi]
     [SwaggerTag(nameof(Assets))]
-    public sealed class AssetContentController : ControllerBase
+    public sealed class AssetContentController : ApiController
     {
         private readonly IAssetStore assetStorage;
         private readonly IAssetRepository assetRepository;
diff --git a/src/Squidex/Areas/Api/Assets/AssetsController.cs b/src/Squidex/Areas/Api/Assets/AssetsController.cs
index a95887bef..c005a66ae 100644
--- a/src/Squidex/Areas/Api/Assets/AssetsController.cs
+++ b/src/Squidex/Areas/Api/Assets/AssetsController.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Assets.Models;
+using Squidex.Areas.Api.Controllers.Assets.Models;
 using Squidex.Domain.Apps.Read.Apps.Services;
 using Squidex.Domain.Apps.Read.Assets.Repositories;
 using Squidex.Domain.Apps.Write.Assets;
@@ -26,7 +26,7 @@ using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Assets
+namespace Squidex.Areas.Api.Controllers.Assets
 {
     /// <summary>
     /// Uploads and retrieves assets.
@@ -35,7 +35,7 @@ namespace Squidex.Controllers.Api.Assets
     [ApiExceptionFilter]
     [AppApi]
     [SwaggerTag(nameof(Assets))]
-    public sealed class AssetsController : ControllerBase
+    public sealed class AssetsController : ApiController
     {
         private readonly IAssetRepository assetRepository;
         private readonly IAssetStatsRepository assetStatsRepository;
diff --git a/src/Squidex/Areas/Api/Assets/Models/AssetCreatedDto.cs b/src/Squidex/Areas/Api/Assets/Models/AssetCreatedDto.cs
index d4ea54220..3265382b4 100644
--- a/src/Squidex/Areas/Api/Assets/Models/AssetCreatedDto.cs
+++ b/src/Squidex/Areas/Api/Assets/Models/AssetCreatedDto.cs
@@ -11,7 +11,7 @@ using System.ComponentModel.DataAnnotations;
 using Squidex.Domain.Apps.Write.Assets.Commands;
 using Squidex.Infrastructure.CQRS.Commands;
 
-namespace Squidex.Controllers.Api.Assets.Models
+namespace Squidex.Areas.Api.Controllers.Assets.Models
 {
     public sealed class AssetCreatedDto
     {
diff --git a/src/Squidex/Areas/Api/Assets/Models/AssetDto.cs b/src/Squidex/Areas/Api/Assets/Models/AssetDto.cs
index ae3b560de..e5ac24f94 100644
--- a/src/Squidex/Areas/Api/Assets/Models/AssetDto.cs
+++ b/src/Squidex/Areas/Api/Assets/Models/AssetDto.cs
@@ -11,7 +11,7 @@ using System.ComponentModel.DataAnnotations;
 using NodaTime;
 using Squidex.Infrastructure;
 
-namespace Squidex.Controllers.Api.Assets.Models
+namespace Squidex.Areas.Api.Controllers.Assets.Models
 {
     public sealed class AssetDto
     {
diff --git a/src/Squidex/Areas/Api/Assets/Models/AssetReplacedDto.cs b/src/Squidex/Areas/Api/Assets/Models/AssetReplacedDto.cs
index ec5e438b2..a324b9ceb 100644
--- a/src/Squidex/Areas/Api/Assets/Models/AssetReplacedDto.cs
+++ b/src/Squidex/Areas/Api/Assets/Models/AssetReplacedDto.cs
@@ -10,7 +10,7 @@ using System.ComponentModel.DataAnnotations;
 using Squidex.Domain.Apps.Write.Assets;
 using Squidex.Domain.Apps.Write.Assets.Commands;
 
-namespace Squidex.Controllers.Api.Assets.Models
+namespace Squidex.Areas.Api.Controllers.Assets.Models
 {
     public sealed class AssetReplacedDto
     {
diff --git a/src/Squidex/Areas/Api/Assets/Models/AssetUpdateDto.cs b/src/Squidex/Areas/Api/Assets/Models/AssetUpdateDto.cs
index 53b84ce34..da77022d9 100644
--- a/src/Squidex/Areas/Api/Assets/Models/AssetUpdateDto.cs
+++ b/src/Squidex/Areas/Api/Assets/Models/AssetUpdateDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Assets.Models
+namespace Squidex.Areas.Api.Controllers.Assets.Models
 {
     public sealed class AssetUpdateDto
     {
diff --git a/src/Squidex/Areas/Api/Assets/Models/AssetsDto.cs b/src/Squidex/Areas/Api/Assets/Models/AssetsDto.cs
index 0811b3f58..d00a2fc31 100644
--- a/src/Squidex/Areas/Api/Assets/Models/AssetsDto.cs
+++ b/src/Squidex/Areas/Api/Assets/Models/AssetsDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.Assets.Models
+namespace Squidex.Areas.Api.Controllers.Assets.Models
 {
     public sealed class AssetsDto
     {
diff --git a/src/Squidex/Areas/Api/Content/ContentSwaggerController.cs b/src/Squidex/Areas/Api/Content/ContentSwaggerController.cs
index fe4d9fc84..be8fb0e6e 100644
--- a/src/Squidex/Areas/Api/Content/ContentSwaggerController.cs
+++ b/src/Squidex/Areas/Api/Content/ContentSwaggerController.cs
@@ -9,17 +9,17 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
-using Squidex.Controllers.ContentApi.Generator;
+using Squidex.Areas.Api.Controllers.Contents.Generator;
 using Squidex.Domain.Apps.Read;
 using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.ContentApi
+namespace Squidex.Areas.Api.Controllers.Contents
 {
     [ApiExceptionFilter]
     [AppApi]
     [SwaggerIgnore]
-    public sealed class ContentSwaggerController : ControllerBase
+    public sealed class ContentSwaggerController : ApiController
     {
         private readonly IAppProvider appProvider;
         private readonly SchemasSwaggerGenerator schemasSwaggerGenerator;
diff --git a/src/Squidex/Areas/Api/Content/ContentsController.cs b/src/Squidex/Areas/Api/Content/ContentsController.cs
index 763a7c6fb..8ad56d2bc 100644
--- a/src/Squidex/Areas/Api/Content/ContentsController.cs
+++ b/src/Squidex/Areas/Api/Content/ContentsController.cs
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using NSwag.Annotations;
-using Squidex.Controllers.ContentApi.Models;
+using Squidex.Areas.Api.Controllers.Contents.Models;
 using Squidex.Domain.Apps.Core.Contents;
 using Squidex.Domain.Apps.Core.ConvertContent;
 using Squidex.Domain.Apps.Read.Contents;
@@ -24,13 +24,13 @@ using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.ContentApi
+namespace Squidex.Areas.Api.Controllers.Contents
 {
     [ApiAuthorize]
     [ApiExceptionFilter]
     [AppApi]
     [SwaggerIgnore]
-    public sealed class ContentsController : ControllerBase
+    public sealed class ContentsController : ApiController
     {
         private readonly IContentQueryService contentQuery;
         private readonly IContentVersionLoader contentVersionLoader;
diff --git a/src/Squidex/Areas/Api/Content/Generator/SchemaSwaggerGenerator.cs b/src/Squidex/Areas/Api/Content/Generator/SchemaSwaggerGenerator.cs
index 82840cb94..88d7500f9 100644
--- a/src/Squidex/Areas/Api/Content/Generator/SchemaSwaggerGenerator.cs
+++ b/src/Squidex/Areas/Api/Content/Generator/SchemaSwaggerGenerator.cs
@@ -19,7 +19,7 @@ using Squidex.Infrastructure;
 using Squidex.Pipeline.Swagger;
 using Squidex.Shared.Identity;
 
-namespace Squidex.Controllers.ContentApi.Generator
+namespace Squidex.Areas.Api.Controllers.Contents.Generator
 {
     public sealed class SchemaSwaggerGenerator
     {
diff --git a/src/Squidex/Areas/Api/Content/Generator/SchemasSwaggerGenerator.cs b/src/Squidex/Areas/Api/Content/Generator/SchemasSwaggerGenerator.cs
index 2b6e6f4f1..58263f4b9 100644
--- a/src/Squidex/Areas/Api/Content/Generator/SchemasSwaggerGenerator.cs
+++ b/src/Squidex/Areas/Api/Content/Generator/SchemasSwaggerGenerator.cs
@@ -21,7 +21,7 @@ using Squidex.Domain.Apps.Read.Schemas;
 using Squidex.Infrastructure;
 using Squidex.Pipeline.Swagger;
 
-namespace Squidex.Controllers.ContentApi.Generator
+namespace Squidex.Areas.Api.Controllers.Contents.Generator
 {
     public sealed class SchemasSwaggerGenerator
     {
diff --git a/src/Squidex/Areas/Api/Content/Models/AssetsDto.cs b/src/Squidex/Areas/Api/Content/Models/AssetsDto.cs
index 62c345510..7888ba044 100644
--- a/src/Squidex/Areas/Api/Content/Models/AssetsDto.cs
+++ b/src/Squidex/Areas/Api/Content/Models/AssetsDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.ContentApi.Models
+namespace Squidex.Areas.Api.Controllers.Contents.Models
 {
     public sealed class AssetsDto
     {
diff --git a/src/Squidex/Areas/Api/Content/Models/ContentDto.cs b/src/Squidex/Areas/Api/Content/Models/ContentDto.cs
index 3d95b00af..90daa7124 100644
--- a/src/Squidex/Areas/Api/Content/Models/ContentDto.cs
+++ b/src/Squidex/Areas/Api/Content/Models/ContentDto.cs
@@ -14,7 +14,7 @@ using Squidex.Domain.Apps.Write.Contents.Commands;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS.Commands;
 
-namespace Squidex.Controllers.ContentApi.Models
+namespace Squidex.Areas.Api.Controllers.Contents.Models
 {
     public sealed class ContentDto
     {
diff --git a/src/Squidex/Areas/Api/Docs/DocsController.cs b/src/Squidex/Areas/Api/Docs/DocsController.cs
index 0a37fbb9d..a6f892596 100644
--- a/src/Squidex/Areas/Api/Docs/DocsController.cs
+++ b/src/Squidex/Areas/Api/Docs/DocsController.cs
@@ -8,13 +8,19 @@
 
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
+using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Docs
+namespace Squidex.Areas.Api.Controllers.Docs
 {
     [SwaggerIgnore]
-    public sealed class DocsController : Controller
+    public sealed class DocsController : ApiController
     {
+        public DocsController(ICommandBus commandBus)
+            : base(commandBus)
+        {
+        }
+
         [HttpGet]
         [Route("docs/")]
         [ApiCosts(0)]
diff --git a/src/Squidex/Areas/Api/DocsVM.cs b/src/Squidex/Areas/Api/DocsVM.cs
index f71fd1b58..d51012baf 100644
--- a/src/Squidex/Areas/Api/DocsVM.cs
+++ b/src/Squidex/Areas/Api/DocsVM.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers
+namespace Squidex.Areas.Api.Controllers
 {
     public sealed class DocsVM
     {
diff --git a/src/Squidex/Areas/Api/EventConsumers/EventConsumersController.cs b/src/Squidex/Areas/Api/EventConsumers/EventConsumersController.cs
index edd14846a..8e44579f3 100644
--- a/src/Squidex/Areas/Api/EventConsumers/EventConsumersController.cs
+++ b/src/Squidex/Areas/Api/EventConsumers/EventConsumersController.cs
@@ -11,22 +11,24 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
 using Orleans;
-using Squidex.Controllers.Api.EventConsumers.Models;
+using Squidex.Areas.Api.Controllers.EventConsumers.Models;
+using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.CQRS.Events.Orleans.Grains;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.EventConsumers
+namespace Squidex.Areas.Api.Controllers.EventConsumers
 {
     [ApiAuthorize]
     [ApiExceptionFilter]
     [MustBeAdministrator]
     [SwaggerIgnore]
-    public sealed class EventConsumersController : Controller
+    public sealed class EventConsumersController : ApiController
     {
         private readonly IEventConsumerRegistryGrain eventConsumerRegistryGrain;
 
-        public EventConsumersController(IClusterClient orleans)
+        public EventConsumersController(ICommandBus commandBus, IClusterClient orleans)
+            : base(commandBus)
         {
             eventConsumerRegistryGrain = orleans.GetGrain<IEventConsumerRegistryGrain>("Default");
         }
diff --git a/src/Squidex/Areas/Api/EventConsumers/Models/EventConsumerDto.cs b/src/Squidex/Areas/Api/EventConsumers/Models/EventConsumerDto.cs
index 7fd83332f..f586c857a 100644
--- a/src/Squidex/Areas/Api/EventConsumers/Models/EventConsumerDto.cs
+++ b/src/Squidex/Areas/Api/EventConsumers/Models/EventConsumerDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.EventConsumers.Models
+namespace Squidex.Areas.Api.Controllers.EventConsumers.Models
 {
     public sealed class EventConsumerDto
     {
diff --git a/src/Squidex/Areas/Api/History/HistoryController.cs b/src/Squidex/Areas/Api/History/HistoryController.cs
index b47b82b8a..e5a8d1775 100644
--- a/src/Squidex/Areas/Api/History/HistoryController.cs
+++ b/src/Squidex/Areas/Api/History/HistoryController.cs
@@ -10,13 +10,13 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.History.Models;
+using Squidex.Areas.Api.Controllers.History.Models;
 using Squidex.Domain.Apps.Read.History.Repositories;
 using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.History
+namespace Squidex.Areas.Api.Controllers.History
 {
     /// <summary>
     /// Readonly API to get an event stream.
@@ -26,7 +26,7 @@ namespace Squidex.Controllers.Api.History
     [AppApi]
     [MustBeAppEditor]
     [SwaggerTag(nameof(History))]
-    public sealed class HistoryController : ControllerBase
+    public sealed class HistoryController : ApiController
     {
         private readonly IHistoryEventRepository historyEventRepository;
 
diff --git a/src/Squidex/Areas/Api/History/Models/HistoryEventDto.cs b/src/Squidex/Areas/Api/History/Models/HistoryEventDto.cs
index 92bfeb91e..48716de8a 100644
--- a/src/Squidex/Areas/Api/History/Models/HistoryEventDto.cs
+++ b/src/Squidex/Areas/Api/History/Models/HistoryEventDto.cs
@@ -10,7 +10,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using NodaTime;
 
-namespace Squidex.Controllers.Api.History.Models
+namespace Squidex.Areas.Api.Controllers.History.Models
 {
     public sealed class HistoryEventDto
     {
diff --git a/src/Squidex/Areas/Api/JsonInheritanceConverter.cs b/src/Squidex/Areas/Api/JsonInheritanceConverter.cs
index 5076a3791..4f8387e52 100644
--- a/src/Squidex/Areas/Api/JsonInheritanceConverter.cs
+++ b/src/Squidex/Areas/Api/JsonInheritanceConverter.cs
@@ -16,7 +16,7 @@ using NJsonSchema.Annotations;
 
 #pragma warning disable SA1306 // Field names must begin with lower-case letter
 
-namespace Squidex.Controllers
+namespace Squidex.Areas.Api.Controllers
 {
     public sealed class JsonInheritanceConverter : JsonConverter
     {
diff --git a/src/Squidex/Areas/Api/LanguageDto.cs b/src/Squidex/Areas/Api/LanguageDto.cs
index 30f9b56a4..e56a22f16 100644
--- a/src/Squidex/Areas/Api/LanguageDto.cs
+++ b/src/Squidex/Areas/Api/LanguageDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api
+namespace Squidex.Areas.Api.Controllers
 {
     public sealed class LanguageDto
     {
diff --git a/src/Squidex/Areas/Api/Languages/LanguagesController.cs b/src/Squidex/Areas/Api/Languages/LanguagesController.cs
index f87546cb1..a52140b0c 100644
--- a/src/Squidex/Areas/Api/Languages/LanguagesController.cs
+++ b/src/Squidex/Areas/Api/Languages/LanguagesController.cs
@@ -10,10 +10,11 @@ using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
 using Squidex.Infrastructure;
+using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Languages
+namespace Squidex.Areas.Api.Controllers.Languages
 {
     /// <summary>
     /// Readonly API to the supported langauges.
@@ -21,8 +22,13 @@ namespace Squidex.Controllers.Api.Languages
     [ApiAuthorize]
     [ApiExceptionFilter]
     [SwaggerTag(nameof(Languages))]
-    public sealed class LanguagesController : Controller
+    public sealed class LanguagesController : ApiController
     {
+        public LanguagesController(ICommandBus commandBus)
+            : base(commandBus)
+        {
+        }
+
         /// <summary>
         /// Get supported languages.
         /// </summary>
diff --git a/src/Squidex/Areas/Api/Ping/PingController.cs b/src/Squidex/Areas/Api/Ping/PingController.cs
index 730569034..2ae735915 100644
--- a/src/Squidex/Areas/Api/Ping/PingController.cs
+++ b/src/Squidex/Areas/Api/Ping/PingController.cs
@@ -8,9 +8,10 @@
 
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
+using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Ping
+namespace Squidex.Areas.Api.Controllers.Ping
 {
     /// <summary>
     /// Makes a ping request.
@@ -20,8 +21,13 @@ namespace Squidex.Controllers.Api.Ping
     [AppApi]
     [MustBeAppReader]
     [SwaggerTag(nameof(Ping))]
-    public sealed class PingController : Controller
+    public sealed class PingController : ApiController
     {
+        public PingController(ICommandBus commandBus)
+            : base(commandBus)
+        {
+        }
+
         /// <summary>
         /// Get ping status.
         /// </summary>
diff --git a/src/Squidex/Areas/Api/Plans/AppPlansController.cs b/src/Squidex/Areas/Api/Plans/AppPlansController.cs
index c69264f98..b362516fe 100644
--- a/src/Squidex/Areas/Api/Plans/AppPlansController.cs
+++ b/src/Squidex/Areas/Api/Plans/AppPlansController.cs
@@ -11,14 +11,14 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Plans.Models;
+using Squidex.Areas.Api.Controllers.Plans.Models;
 using Squidex.Domain.Apps.Read.Apps.Services;
 using Squidex.Domain.Apps.Write.Apps.Commands;
 using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Plans
+namespace Squidex.Areas.Api.Controllers.Plans
 {
     /// <summary>
     /// Manages and configures plans.
@@ -27,7 +27,7 @@ namespace Squidex.Controllers.Api.Plans
     [ApiExceptionFilter]
     [AppApi]
     [SwaggerTag(nameof(Plans))]
-    public sealed class AppPlansController : ControllerBase
+    public sealed class AppPlansController : ApiController
     {
         private readonly IAppPlansProvider appPlansProvider;
         private readonly IAppPlanBillingManager appPlansBillingManager;
diff --git a/src/Squidex/Areas/Api/Plans/Models/AppPlansDto.cs b/src/Squidex/Areas/Api/Plans/Models/AppPlansDto.cs
index a44c341fe..0f797b446 100644
--- a/src/Squidex/Areas/Api/Plans/Models/AppPlansDto.cs
+++ b/src/Squidex/Areas/Api/Plans/Models/AppPlansDto.cs
@@ -8,7 +8,7 @@
 
 using System.Collections.Generic;
 
-namespace Squidex.Controllers.Api.Plans.Models
+namespace Squidex.Areas.Api.Controllers.Plans.Models
 {
     public sealed class AppPlansDto
     {
diff --git a/src/Squidex/Areas/Api/Plans/Models/ChangePlanDto.cs b/src/Squidex/Areas/Api/Plans/Models/ChangePlanDto.cs
index 5daadd6d8..ac3155917 100644
--- a/src/Squidex/Areas/Api/Plans/Models/ChangePlanDto.cs
+++ b/src/Squidex/Areas/Api/Plans/Models/ChangePlanDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Plans.Models
+namespace Squidex.Areas.Api.Controllers.Plans.Models
 {
     public sealed class ChangePlanDto
     {
diff --git a/src/Squidex/Areas/Api/Plans/Models/PlanChangedDto.cs b/src/Squidex/Areas/Api/Plans/Models/PlanChangedDto.cs
index afb56d754..2c034d25b 100644
--- a/src/Squidex/Areas/Api/Plans/Models/PlanChangedDto.cs
+++ b/src/Squidex/Areas/Api/Plans/Models/PlanChangedDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.Plans.Models
+namespace Squidex.Areas.Api.Controllers.Plans.Models
 {
     public sealed class PlanChangedDto
     {
diff --git a/src/Squidex/Areas/Api/Plans/Models/PlanDto.cs b/src/Squidex/Areas/Api/Plans/Models/PlanDto.cs
index 0c45639ea..d7526d1bc 100644
--- a/src/Squidex/Areas/Api/Plans/Models/PlanDto.cs
+++ b/src/Squidex/Areas/Api/Plans/Models/PlanDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.Plans.Models
+namespace Squidex.Areas.Api.Controllers.Plans.Models
 {
     public sealed class PlanDto
     {
diff --git a/src/Squidex/Areas/Api/Rules/Models/Actions/WebhookActionDto.cs b/src/Squidex/Areas/Api/Rules/Models/Actions/WebhookActionDto.cs
index d7f1c909e..c927ecf92 100644
--- a/src/Squidex/Areas/Api/Rules/Models/Actions/WebhookActionDto.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/Actions/WebhookActionDto.cs
@@ -13,7 +13,7 @@ using Squidex.Domain.Apps.Core.Rules;
 using Squidex.Domain.Apps.Core.Rules.Actions;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Rules.Models.Actions
+namespace Squidex.Areas.Api.Controllers.Rules.Models.Actions
 {
     [JsonSchema("Webhook")]
     public sealed class WebhookActionDto : RuleActionDto
diff --git a/src/Squidex/Areas/Api/Rules/Models/Converters/RuleActionDtoFactory.cs b/src/Squidex/Areas/Api/Rules/Models/Converters/RuleActionDtoFactory.cs
index fe28cd931..09f12bdf6 100644
--- a/src/Squidex/Areas/Api/Rules/Models/Converters/RuleActionDtoFactory.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/Converters/RuleActionDtoFactory.cs
@@ -6,12 +6,12 @@
 //  All rights reserved.
 // ==========================================================================
 
-using Squidex.Controllers.Api.Rules.Models.Actions;
+using Squidex.Areas.Api.Controllers.Rules.Models.Actions;
 using Squidex.Domain.Apps.Core.Rules;
 using Squidex.Domain.Apps.Core.Rules.Actions;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Rules.Models.Converters
+namespace Squidex.Areas.Api.Controllers.Rules.Models.Converters
 {
     public sealed class RuleActionDtoFactory : IRuleActionVisitor<RuleActionDto>
     {
diff --git a/src/Squidex/Areas/Api/Rules/Models/Converters/RuleConverter.cs b/src/Squidex/Areas/Api/Rules/Models/Converters/RuleConverter.cs
index 0bac173f5..3cf4b64ed 100644
--- a/src/Squidex/Areas/Api/Rules/Models/Converters/RuleConverter.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/Converters/RuleConverter.cs
@@ -11,7 +11,7 @@ using Squidex.Domain.Apps.Read.Rules;
 using Squidex.Domain.Apps.Write.Rules.Commands;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Rules.Models.Converters
+namespace Squidex.Areas.Api.Controllers.Rules.Models.Converters
 {
     public static class RuleConverter
     {
diff --git a/src/Squidex/Areas/Api/Rules/Models/Converters/RuleTriggerDtoFactory.cs b/src/Squidex/Areas/Api/Rules/Models/Converters/RuleTriggerDtoFactory.cs
index a9d38a6bf..b0bd6de67 100644
--- a/src/Squidex/Areas/Api/Rules/Models/Converters/RuleTriggerDtoFactory.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/Converters/RuleTriggerDtoFactory.cs
@@ -7,12 +7,12 @@
 // ==========================================================================
 
 using System.Linq;
-using Squidex.Controllers.Api.Rules.Models.Triggers;
+using Squidex.Areas.Api.Controllers.Rules.Models.Triggers;
 using Squidex.Domain.Apps.Core.Rules;
 using Squidex.Domain.Apps.Core.Rules.Triggers;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Rules.Models.Converters
+namespace Squidex.Areas.Api.Controllers.Rules.Models.Converters
 {
     public sealed class RuleTriggerDtoFactory : IRuleTriggerVisitor<RuleTriggerDto>
     {
diff --git a/src/Squidex/Areas/Api/Rules/Models/CreateRuleDto.cs b/src/Squidex/Areas/Api/Rules/Models/CreateRuleDto.cs
index 060ff6461..4887c2761 100644
--- a/src/Squidex/Areas/Api/Rules/Models/CreateRuleDto.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/CreateRuleDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Rules.Models
+namespace Squidex.Areas.Api.Controllers.Rules.Models
 {
     public sealed class CreateRuleDto
     {
diff --git a/src/Squidex/Areas/Api/Rules/Models/RuleActionDto.cs b/src/Squidex/Areas/Api/Rules/Models/RuleActionDto.cs
index 2b95ed5b6..67ad0a53c 100644
--- a/src/Squidex/Areas/Api/Rules/Models/RuleActionDto.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/RuleActionDto.cs
@@ -8,10 +8,10 @@
 
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
-using Squidex.Controllers.Api.Rules.Models.Actions;
+using Squidex.Areas.Api.Controllers.Rules.Models.Actions;
 using Squidex.Domain.Apps.Core.Rules;
 
-namespace Squidex.Controllers.Api.Rules.Models
+namespace Squidex.Areas.Api.Controllers.Rules.Models
 {
     [JsonConverter(typeof(JsonInheritanceConverter), "actionType")]
     [KnownType(typeof(WebhookActionDto))]
diff --git a/src/Squidex/Areas/Api/Rules/Models/RuleDto.cs b/src/Squidex/Areas/Api/Rules/Models/RuleDto.cs
index d6c3ade48..05c0afadd 100644
--- a/src/Squidex/Areas/Api/Rules/Models/RuleDto.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/RuleDto.cs
@@ -11,7 +11,7 @@ using System.ComponentModel.DataAnnotations;
 using NodaTime;
 using Squidex.Infrastructure;
 
-namespace Squidex.Controllers.Api.Rules.Models
+namespace Squidex.Areas.Api.Controllers.Rules.Models
 {
     public sealed class RuleDto
     {
diff --git a/src/Squidex/Areas/Api/Rules/Models/RuleEventDto.cs b/src/Squidex/Areas/Api/Rules/Models/RuleEventDto.cs
index 5513d5a25..1a09e88be 100644
--- a/src/Squidex/Areas/Api/Rules/Models/RuleEventDto.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/RuleEventDto.cs
@@ -12,7 +12,7 @@ using NodaTime;
 using Squidex.Domain.Apps.Core.HandleRules;
 using Squidex.Domain.Apps.Read.Rules;
 
-namespace Squidex.Controllers.Api.Rules.Models
+namespace Squidex.Areas.Api.Controllers.Rules.Models
 {
     public sealed class RuleEventDto
     {
diff --git a/src/Squidex/Areas/Api/Rules/Models/RuleEventsDto.cs b/src/Squidex/Areas/Api/Rules/Models/RuleEventsDto.cs
index f0cda8a38..eec9ef2e7 100644
--- a/src/Squidex/Areas/Api/Rules/Models/RuleEventsDto.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/RuleEventsDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.Rules.Models
+namespace Squidex.Areas.Api.Controllers.Rules.Models
 {
     public sealed class RuleEventsDto
     {
diff --git a/src/Squidex/Areas/Api/Rules/Models/RuleTriggerDto.cs b/src/Squidex/Areas/Api/Rules/Models/RuleTriggerDto.cs
index f65ea3f46..671dd25e3 100644
--- a/src/Squidex/Areas/Api/Rules/Models/RuleTriggerDto.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/RuleTriggerDto.cs
@@ -8,10 +8,10 @@
 
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
-using Squidex.Controllers.Api.Rules.Models.Triggers;
+using Squidex.Areas.Api.Controllers.Rules.Models.Triggers;
 using Squidex.Domain.Apps.Core.Rules;
 
-namespace Squidex.Controllers.Api.Rules.Models
+namespace Squidex.Areas.Api.Controllers.Rules.Models
 {
     [JsonConverter(typeof(JsonInheritanceConverter), "triggerType")]
     [KnownType(typeof(ContentChangedTriggerDto))]
diff --git a/src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerDto.cs b/src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerDto.cs
index 76c203f06..ab7fba80b 100644
--- a/src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerDto.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerDto.cs
@@ -15,7 +15,7 @@ using Squidex.Domain.Apps.Core.Rules;
 using Squidex.Domain.Apps.Core.Rules.Triggers;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Rules.Models.Triggers
+namespace Squidex.Areas.Api.Controllers.Rules.Models.Triggers
 {
     [JsonSchema("ContentChanged")]
     public sealed class ContentChangedTriggerDto : RuleTriggerDto
diff --git a/src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerSchemaDto.cs b/src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerSchemaDto.cs
index 29e0c71fd..cde7d7567 100644
--- a/src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerSchemaDto.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/Triggers/ContentChangedTriggerSchemaDto.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace Squidex.Controllers.Api.Rules.Models.Triggers
+namespace Squidex.Areas.Api.Controllers.Rules.Models.Triggers
 {
     public sealed class ContentChangedTriggerSchemaDto
     {
diff --git a/src/Squidex/Areas/Api/Rules/Models/UpdateRuleDto.cs b/src/Squidex/Areas/Api/Rules/Models/UpdateRuleDto.cs
index bad710cc8..35bc2cc90 100644
--- a/src/Squidex/Areas/Api/Rules/Models/UpdateRuleDto.cs
+++ b/src/Squidex/Areas/Api/Rules/Models/UpdateRuleDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.Rules.Models
+namespace Squidex.Areas.Api.Controllers.Rules.Models
 {
     public sealed class UpdateRuleDto
     {
diff --git a/src/Squidex/Areas/Api/Rules/RulesController.cs b/src/Squidex/Areas/Api/Rules/RulesController.cs
index ab4d1fab5..f3efccc00 100644
--- a/src/Squidex/Areas/Api/Rules/RulesController.cs
+++ b/src/Squidex/Areas/Api/Rules/RulesController.cs
@@ -12,8 +12,8 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using NodaTime;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Rules.Models;
-using Squidex.Controllers.Api.Rules.Models.Converters;
+using Squidex.Areas.Api.Controllers.Rules.Models;
+using Squidex.Areas.Api.Controllers.Rules.Models.Converters;
 using Squidex.Domain.Apps.Read;
 using Squidex.Domain.Apps.Read.Rules.Repositories;
 using Squidex.Domain.Apps.Write.Rules.Commands;
@@ -21,7 +21,7 @@ using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Rules
+namespace Squidex.Areas.Api.Controllers.Rules
 {
     /// <summary>
     /// Manages and retrieves information about schemas.
@@ -31,7 +31,7 @@ namespace Squidex.Controllers.Api.Rules
     [AppApi]
     [SwaggerTag(nameof(Rules))]
     [MustBeAppDeveloper]
-    public sealed class RulesController : ControllerBase
+    public sealed class RulesController : ApiController
     {
         private readonly IAppProvider appProvider;
         private readonly IRuleEventRepository ruleEventsRepository;
diff --git a/src/Squidex/Areas/Api/Schemas/Models/AddFieldDto.cs b/src/Squidex/Areas/Api/Schemas/Models/AddFieldDto.cs
index 5b8672050..8e7f9d1be 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/AddFieldDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/AddFieldDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class AddFieldDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/ConfigureScriptsDto.cs b/src/Squidex/Areas/Api/Schemas/Models/ConfigureScriptsDto.cs
index 0fe895a3e..cf13fcd66 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/ConfigureScriptsDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/ConfigureScriptsDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class ConfigureScriptsDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs b/src/Squidex/Areas/Api/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs
index 5b803f707..33581dd9f 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs
@@ -7,11 +7,11 @@
 // ==========================================================================
 
 using System.Linq;
-using Squidex.Controllers.Api.Schemas.Models.Fields;
+using Squidex.Areas.Api.Controllers.Schemas.Models.Fields;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Converters
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Converters
 {
     public class FieldPropertiesDtoFactory : IFieldPropertiesVisitor<FieldPropertiesDto>
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Converters/SchemaConverter.cs b/src/Squidex/Areas/Api/Schemas/Models/Converters/SchemaConverter.cs
index 9bd06f0de..3183569b1 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Converters/SchemaConverter.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Converters/SchemaConverter.cs
@@ -11,7 +11,7 @@ using Squidex.Domain.Apps.Read.Schemas;
 using Squidex.Domain.Apps.Write.Schemas.Commands;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Converters
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Converters
 {
     public static class SchemaConverter
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/CreateSchemaDto.cs b/src/Squidex/Areas/Api/Schemas/Models/CreateSchemaDto.cs
index b4da5cba2..3f3bfaec8 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/CreateSchemaDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/CreateSchemaDto.cs
@@ -9,7 +9,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class CreateSchemaDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/CreateSchemaFieldDto.cs b/src/Squidex/Areas/Api/Schemas/Models/CreateSchemaFieldDto.cs
index 7a043aeb5..88c277b5b 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/CreateSchemaFieldDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/CreateSchemaFieldDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class CreateSchemaFieldDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/FieldDto.cs b/src/Squidex/Areas/Api/Schemas/Models/FieldDto.cs
index 8e8c95f14..c6a2b0bf1 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/FieldDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/FieldDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class FieldDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/FieldPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/FieldPropertiesDto.cs
index 31e33fbad..5540ebc26 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/FieldPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/FieldPropertiesDto.cs
@@ -9,10 +9,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
-using Squidex.Controllers.Api.Schemas.Models.Fields;
+using Squidex.Areas.Api.Controllers.Schemas.Models.Fields;
 using Squidex.Domain.Apps.Core.Schemas;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     [JsonConverter(typeof(JsonInheritanceConverter), "fieldType")]
     [KnownType(typeof(AssetsFieldPropertiesDto))]
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs
index b2e7a3d50..c9d91f8a6 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs
@@ -10,7 +10,7 @@ using NJsonSchema.Annotations;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
 {
     [JsonSchema("Assets")]
     public sealed class AssetsFieldPropertiesDto : FieldPropertiesDto
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/BooleanFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/Fields/BooleanFieldPropertiesDto.cs
index 8516d4b92..9f21f7178 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Fields/BooleanFieldPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Fields/BooleanFieldPropertiesDto.cs
@@ -12,7 +12,7 @@ using NJsonSchema.Annotations;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
 {
     [JsonSchema("Boolean")]
     public sealed class BooleanFieldPropertiesDto : FieldPropertiesDto
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/DateTimeFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/Fields/DateTimeFieldPropertiesDto.cs
index 4cdc78c49..f07dc09f1 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Fields/DateTimeFieldPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Fields/DateTimeFieldPropertiesDto.cs
@@ -13,7 +13,7 @@ using NodaTime;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
 {
     [JsonSchema("DateTime")]
     public sealed class DateTimeFieldPropertiesDto : FieldPropertiesDto
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/GeolocationFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/Fields/GeolocationFieldPropertiesDto.cs
index 76e1a1ce0..f684d6868 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Fields/GeolocationFieldPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Fields/GeolocationFieldPropertiesDto.cs
@@ -12,7 +12,7 @@ using NJsonSchema.Annotations;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
 {
     [JsonSchema("Geolocation")]
     public sealed class GeolocationFieldPropertiesDto : FieldPropertiesDto
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/JsonFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/Fields/JsonFieldPropertiesDto.cs
index 68f9fe290..fb3882223 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Fields/JsonFieldPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Fields/JsonFieldPropertiesDto.cs
@@ -10,7 +10,7 @@ using NJsonSchema.Annotations;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
 {
     [JsonSchema("Json")]
     public sealed class JsonFieldPropertiesDto : FieldPropertiesDto
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/NumberFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/Fields/NumberFieldPropertiesDto.cs
index fbc3d072a..d938c71f9 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Fields/NumberFieldPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Fields/NumberFieldPropertiesDto.cs
@@ -13,7 +13,7 @@ using NJsonSchema.Annotations;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
 {
     [JsonSchema("Number")]
     public sealed class NumberFieldPropertiesDto : FieldPropertiesDto
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs
index e35541086..d1c85eda3 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs
@@ -11,7 +11,7 @@ using NJsonSchema.Annotations;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
 {
     [JsonSchema("References")]
     public sealed class ReferencesFieldPropertiesDto : FieldPropertiesDto
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/StringFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/Fields/StringFieldPropertiesDto.cs
index 07015881d..25abd5b77 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Fields/StringFieldPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Fields/StringFieldPropertiesDto.cs
@@ -13,7 +13,7 @@ using NJsonSchema.Annotations;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
 {
     [JsonSchema("String")]
     public sealed class StringFieldPropertiesDto : FieldPropertiesDto
diff --git a/src/Squidex/Areas/Api/Schemas/Models/Fields/TagsFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/Fields/TagsFieldPropertiesDto.cs
index 0769967ad..e50b40d57 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/Fields/TagsFieldPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/Fields/TagsFieldPropertiesDto.cs
@@ -10,7 +10,7 @@ using NJsonSchema.Annotations;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure.Reflection;
 
-namespace Squidex.Controllers.Api.Schemas.Models.Fields
+namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
 {
     [JsonSchema("Tags")]
     public sealed class TagsFieldPropertiesDto : FieldPropertiesDto
diff --git a/src/Squidex/Areas/Api/Schemas/Models/ReorderFieldsDto.cs b/src/Squidex/Areas/Api/Schemas/Models/ReorderFieldsDto.cs
index ae7cd21be..ff2062aab 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/ReorderFieldsDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/ReorderFieldsDto.cs
@@ -9,7 +9,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class ReorderFieldsDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/SchemaDetailsDto.cs b/src/Squidex/Areas/Api/Schemas/Models/SchemaDetailsDto.cs
index 34e06a360..5fa61cc36 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/SchemaDetailsDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/SchemaDetailsDto.cs
@@ -12,7 +12,7 @@ using System.ComponentModel.DataAnnotations;
 using NodaTime;
 using Squidex.Infrastructure;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class SchemaDetailsDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/SchemaDto.cs b/src/Squidex/Areas/Api/Schemas/Models/SchemaDto.cs
index 1d6cf78e2..eb2031157 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/SchemaDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/SchemaDto.cs
@@ -11,7 +11,7 @@ using System.ComponentModel.DataAnnotations;
 using NodaTime;
 using Squidex.Infrastructure;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class SchemaDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/SchemaPropertiesDto.cs b/src/Squidex/Areas/Api/Schemas/Models/SchemaPropertiesDto.cs
index 822c6f12b..d6fc03200 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/SchemaPropertiesDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/SchemaPropertiesDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class SchemaPropertiesDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/UpdateFieldDto.cs b/src/Squidex/Areas/Api/Schemas/Models/UpdateFieldDto.cs
index 6ec10e43c..082ecdaa2 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/UpdateFieldDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/UpdateFieldDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class UpdateFieldDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/Models/UpdateSchemaDto.cs b/src/Squidex/Areas/Api/Schemas/Models/UpdateSchemaDto.cs
index 6c3ea84ed..e8a91646a 100644
--- a/src/Squidex/Areas/Api/Schemas/Models/UpdateSchemaDto.cs
+++ b/src/Squidex/Areas/Api/Schemas/Models/UpdateSchemaDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Schemas.Models
+namespace Squidex.Areas.Api.Controllers.Schemas.Models
 {
     public sealed class UpdateSchemaDto
     {
diff --git a/src/Squidex/Areas/Api/Schemas/SchemaFieldsController.cs b/src/Squidex/Areas/Api/Schemas/SchemaFieldsController.cs
index c4ec2e529..fe08c3f8a 100644
--- a/src/Squidex/Areas/Api/Schemas/SchemaFieldsController.cs
+++ b/src/Squidex/Areas/Api/Schemas/SchemaFieldsController.cs
@@ -9,12 +9,12 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Schemas.Models;
+using Squidex.Areas.Api.Controllers.Schemas.Models;
 using Squidex.Domain.Apps.Write.Schemas.Commands;
 using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Schemas
+namespace Squidex.Areas.Api.Controllers.Schemas
 {
     /// <summary>
     /// Manages and retrieves information about schemas.
@@ -24,7 +24,7 @@ namespace Squidex.Controllers.Api.Schemas
     [AppApi]
     [MustBeAppDeveloper]
     [SwaggerTag(nameof(Schemas))]
-    public sealed class SchemaFieldsController : ControllerBase
+    public sealed class SchemaFieldsController : ApiController
     {
         public SchemaFieldsController(ICommandBus commandBus)
             : base(commandBus)
diff --git a/src/Squidex/Areas/Api/Schemas/SchemasController.cs b/src/Squidex/Areas/Api/Schemas/SchemasController.cs
index 8e218395b..65da638f2 100644
--- a/src/Squidex/Areas/Api/Schemas/SchemasController.cs
+++ b/src/Squidex/Areas/Api/Schemas/SchemasController.cs
@@ -12,8 +12,8 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Schemas.Models;
-using Squidex.Controllers.Api.Schemas.Models.Converters;
+using Squidex.Areas.Api.Controllers.Schemas.Models;
+using Squidex.Areas.Api.Controllers.Schemas.Models.Converters;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Domain.Apps.Read;
 using Squidex.Domain.Apps.Read.Schemas;
@@ -22,7 +22,7 @@ using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Schemas
+namespace Squidex.Areas.Api.Controllers.Schemas
 {
     /// <summary>
     /// Manages and retrieves information about schemas.
@@ -31,7 +31,7 @@ namespace Squidex.Controllers.Api.Schemas
     [ApiExceptionFilter]
     [AppApi]
     [SwaggerTag(nameof(Schemas))]
-    public sealed class SchemasController : ControllerBase
+    public sealed class SchemasController : ApiController
     {
         private readonly IAppProvider appProvider;
 
diff --git a/src/Squidex/Areas/Api/Statistics/Models/CallsUsageDto.cs b/src/Squidex/Areas/Api/Statistics/Models/CallsUsageDto.cs
index 99ff2038d..40f08251c 100644
--- a/src/Squidex/Areas/Api/Statistics/Models/CallsUsageDto.cs
+++ b/src/Squidex/Areas/Api/Statistics/Models/CallsUsageDto.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace Squidex.Controllers.Api.Statistics.Models
+namespace Squidex.Areas.Api.Controllers.Statistics.Models
 {
     public sealed class CallsUsageDto
     {
diff --git a/src/Squidex/Areas/Api/Statistics/Models/CurrentCallsDto.cs b/src/Squidex/Areas/Api/Statistics/Models/CurrentCallsDto.cs
index 19d797079..3870c0572 100644
--- a/src/Squidex/Areas/Api/Statistics/Models/CurrentCallsDto.cs
+++ b/src/Squidex/Areas/Api/Statistics/Models/CurrentCallsDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.Statistics.Models
+namespace Squidex.Areas.Api.Controllers.Statistics.Models
 {
     public sealed class CurrentCallsDto
     {
diff --git a/src/Squidex/Areas/Api/Statistics/Models/CurrentStorageDto.cs b/src/Squidex/Areas/Api/Statistics/Models/CurrentStorageDto.cs
index 30d59396f..79b6550d8 100644
--- a/src/Squidex/Areas/Api/Statistics/Models/CurrentStorageDto.cs
+++ b/src/Squidex/Areas/Api/Statistics/Models/CurrentStorageDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.Statistics.Models
+namespace Squidex.Areas.Api.Controllers.Statistics.Models
 {
     public sealed class CurrentStorageDto
     {
diff --git a/src/Squidex/Areas/Api/Statistics/Models/StorageUsageDto.cs b/src/Squidex/Areas/Api/Statistics/Models/StorageUsageDto.cs
index a03eef402..205ebcbb4 100644
--- a/src/Squidex/Areas/Api/Statistics/Models/StorageUsageDto.cs
+++ b/src/Squidex/Areas/Api/Statistics/Models/StorageUsageDto.cs
@@ -8,7 +8,7 @@
 
 using System;
 
-namespace Squidex.Controllers.Api.Statistics.Models
+namespace Squidex.Areas.Api.Controllers.Statistics.Models
 {
     public sealed class StorageUsageDto
     {
diff --git a/src/Squidex/Areas/Api/Statistics/UsagesController.cs b/src/Squidex/Areas/Api/Statistics/UsagesController.cs
index a3b0a1f16..2be660d10 100644
--- a/src/Squidex/Areas/Api/Statistics/UsagesController.cs
+++ b/src/Squidex/Areas/Api/Statistics/UsagesController.cs
@@ -11,14 +11,14 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Statistics.Models;
+using Squidex.Areas.Api.Controllers.Statistics.Models;
 using Squidex.Domain.Apps.Read.Apps.Services;
 using Squidex.Domain.Apps.Read.Assets.Repositories;
 using Squidex.Infrastructure.CQRS.Commands;
 using Squidex.Infrastructure.UsageTracking;
 using Squidex.Pipeline;
 
-namespace Squidex.Controllers.Api.Statistics
+namespace Squidex.Areas.Api.Controllers.Statistics
 {
     /// <summary>
     /// Retrieves usage information for apps.
@@ -28,7 +28,7 @@ namespace Squidex.Controllers.Api.Statistics
     [AppApi]
     [MustBeAppEditor]
     [SwaggerTag(nameof(Statistics))]
-    public sealed class UsagesController : ControllerBase
+    public sealed class UsagesController : ApiController
     {
         private readonly IUsageTracker usageTracker;
         private readonly IAppPlansProvider appPlanProvider;
diff --git a/src/Squidex/Areas/Api/UI/Models/UIRegexSuggestionDto.cs b/src/Squidex/Areas/Api/UI/Models/UIRegexSuggestionDto.cs
index cd47f6fd1..363c86758 100644
--- a/src/Squidex/Areas/Api/UI/Models/UIRegexSuggestionDto.cs
+++ b/src/Squidex/Areas/Api/UI/Models/UIRegexSuggestionDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.UI.Models
+namespace Squidex.Areas.Api.Controllers.UI.Models
 {
     public sealed class UIRegexSuggestionDto
     {
diff --git a/src/Squidex/Areas/Api/UI/Models/UISettingsDto.cs b/src/Squidex/Areas/Api/UI/Models/UISettingsDto.cs
index 73df39d84..6c051df7f 100644
--- a/src/Squidex/Areas/Api/UI/Models/UISettingsDto.cs
+++ b/src/Squidex/Areas/Api/UI/Models/UISettingsDto.cs
@@ -9,7 +9,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.UI.Models
+namespace Squidex.Areas.Api.Controllers.UI.Models
 {
     public sealed class UISettingsDto
     {
diff --git a/src/Squidex/Areas/Api/UI/UIController.cs b/src/Squidex/Areas/Api/UI/UIController.cs
index c94b4450a..e13cd0b64 100644
--- a/src/Squidex/Areas/Api/UI/UIController.cs
+++ b/src/Squidex/Areas/Api/UI/UIController.cs
@@ -12,21 +12,23 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using NSwag.Annotations;
 using Squidex.Config;
-using Squidex.Controllers.Api.UI.Models;
+using Squidex.Areas.Api.Controllers.UI.Models;
 using Squidex.Pipeline;
+using Squidex.Infrastructure.CQRS.Commands;
 
-namespace Squidex.Controllers.Api.UI
+namespace Squidex.Areas.Api.Controllers.UI
 {
     /// <summary>
     /// Manages ui settings and configs.
     /// </summary>
     [ApiExceptionFilter]
     [SwaggerTag(nameof(UI))]
-    public sealed class UIController : Controller
+    public sealed class UIController : ApiController
     {
         private readonly MyUIOptions uiOptions;
 
-        public UIController(IOptions<MyUIOptions> uiOptions)
+        public UIController(ICommandBus commandBus, IOptions<MyUIOptions> uiOptions)
+            : base(commandBus)
         {
             this.uiOptions = uiOptions.Value;
         }
diff --git a/src/Squidex/Areas/Api/Users/Models/CreateUserDto.cs b/src/Squidex/Areas/Api/Users/Models/CreateUserDto.cs
index 77a4167c4..bdeab5881 100644
--- a/src/Squidex/Areas/Api/Users/Models/CreateUserDto.cs
+++ b/src/Squidex/Areas/Api/Users/Models/CreateUserDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Users.Models
+namespace Squidex.Areas.Api.Controllers.Users.Models
 {
     public sealed class CreateUserDto
     {
diff --git a/src/Squidex/Areas/Api/Users/Models/UpdateUserDto.cs b/src/Squidex/Areas/Api/Users/Models/UpdateUserDto.cs
index ed8569ad2..fada1e7be 100644
--- a/src/Squidex/Areas/Api/Users/Models/UpdateUserDto.cs
+++ b/src/Squidex/Areas/Api/Users/Models/UpdateUserDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Users.Models
+namespace Squidex.Areas.Api.Controllers.Users.Models
 {
     public sealed class UpdateUserDto
     {
diff --git a/src/Squidex/Areas/Api/Users/Models/UserCreatedDto.cs b/src/Squidex/Areas/Api/Users/Models/UserCreatedDto.cs
index 3e84a714c..4f7ad78f1 100644
--- a/src/Squidex/Areas/Api/Users/Models/UserCreatedDto.cs
+++ b/src/Squidex/Areas/Api/Users/Models/UserCreatedDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Users.Models
+namespace Squidex.Areas.Api.Controllers.Users.Models
 {
     public sealed class UserCreatedDto
     {
diff --git a/src/Squidex/Areas/Api/Users/Models/UserDto.cs b/src/Squidex/Areas/Api/Users/Models/UserDto.cs
index cc2778101..b674c0ab8 100644
--- a/src/Squidex/Areas/Api/Users/Models/UserDto.cs
+++ b/src/Squidex/Areas/Api/Users/Models/UserDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api.Users.Models
+namespace Squidex.Areas.Api.Controllers.Users.Models
 {
     public sealed class UserDto
     {
diff --git a/src/Squidex/Areas/Api/Users/Models/UsersDto.cs b/src/Squidex/Areas/Api/Users/Models/UsersDto.cs
index 919150480..01e8ed900 100644
--- a/src/Squidex/Areas/Api/Users/Models/UsersDto.cs
+++ b/src/Squidex/Areas/Api/Users/Models/UsersDto.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-namespace Squidex.Controllers.Api.Users.Models
+namespace Squidex.Areas.Api.Controllers.Users.Models
 {
     public sealed class UsersDto
     {
diff --git a/src/Squidex/Areas/Api/Users/UserManagementController.cs b/src/Squidex/Areas/Api/Users/UserManagementController.cs
index 59b647753..d28bdcf25 100644
--- a/src/Squidex/Areas/Api/Users/UserManagementController.cs
+++ b/src/Squidex/Areas/Api/Users/UserManagementController.cs
@@ -12,26 +12,28 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Users.Models;
+using Squidex.Areas.Api.Controllers.Users.Models;
 using Squidex.Domain.Users;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Infrastructure.Security;
 using Squidex.Pipeline;
 using Squidex.Shared.Users;
+using Squidex.Infrastructure.CQRS.Commands;
 
-namespace Squidex.Controllers.Api.Users
+namespace Squidex.Areas.Api.Controllers.Users
 {
     [ApiAuthorize]
     [ApiExceptionFilter]
     [MustBeAdministrator]
     [SwaggerIgnore]
-    public sealed class UserManagementController : Controller
+    public sealed class UserManagementController : ApiController
     {
         private readonly UserManager<IUser> userManager;
         private readonly IUserFactory userFactory;
 
-        public UserManagementController(UserManager<IUser> userManager, IUserFactory userFactory)
+        public UserManagementController(ICommandBus commandBus, UserManager<IUser> userManager, IUserFactory userFactory)
+            : base(commandBus)
         {
             this.userManager = userManager;
             this.userFactory = userFactory;
diff --git a/src/Squidex/Areas/Api/Users/UsersController.cs b/src/Squidex/Areas/Api/Users/UsersController.cs
index 5ec95aedd..02b8c3814 100644
--- a/src/Squidex/Areas/Api/Users/UsersController.cs
+++ b/src/Squidex/Areas/Api/Users/UsersController.cs
@@ -14,20 +14,21 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
-using Squidex.Controllers.Api.Users.Models;
+using Squidex.Areas.Api.Controllers.Users.Models;
 using Squidex.Domain.Users;
 using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 using Squidex.Shared.Users;
+using Squidex.Infrastructure.CQRS.Commands;
 
-namespace Squidex.Controllers.Api.Users
+namespace Squidex.Areas.Api.Controllers.Users
 {
     /// <summary>
     /// Readonly API to retrieve information about squidex users.
     /// </summary>
     [ApiExceptionFilter]
     [SwaggerTag(nameof(Users))]
-    public sealed class UsersController : Controller
+    public sealed class UsersController : ApiController
     {
         private static readonly byte[] AvatarBytes;
         private readonly UserManager<IUser> userManager;
@@ -37,7 +38,7 @@ namespace Squidex.Controllers.Api.Users
         {
             var assembly = typeof(UsersController).GetTypeInfo().Assembly;
 
-            using (var avatarStream = assembly.GetManifestResourceStream("Squidex.Controllers.Api.Users.Assets.Avatar.png"))
+            using (var avatarStream = assembly.GetManifestResourceStream("Squidex.Areas.Api.Controllers.Users.Assets.Avatar.png"))
             {
                 AvatarBytes = new byte[avatarStream.Length];
 
@@ -45,7 +46,8 @@ namespace Squidex.Controllers.Api.Users
             }
         }
 
-        public UsersController(UserManager<IUser> userManager, IUserPictureStore userPictureStore)
+        public UsersController(ICommandBus commandBus, UserManager<IUser> userManager, IUserPictureStore userPictureStore)
+            : base(commandBus)
         {
             this.userManager = userManager;
             this.userPictureStore = userPictureStore;
diff --git a/src/Squidex/Config/Swagger/SwaggerServices.cs b/src/Squidex/Config/Swagger/SwaggerServices.cs
index c382e32d2..5119fa2be 100644
--- a/src/Squidex/Config/Swagger/SwaggerServices.cs
+++ b/src/Squidex/Config/Swagger/SwaggerServices.cs
@@ -14,7 +14,7 @@ using NJsonSchema.Generation.TypeMappers;
 using NodaTime;
 using NSwag.AspNetCore;
 using NSwag.SwaggerGeneration.Processors.Security;
-using Squidex.Controllers.ContentApi.Generator;
+using Squidex.Areas.Api.Controllers.Contents.Generator;
 using Squidex.Infrastructure;
 using Squidex.Pipeline.Swagger;
 
diff --git a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
index 623e33136..f28c06fa9 100644
--- a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
+++ b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Squidex.Controllers.Api;
+using Squidex.Areas.Api.Controllers;
 using Squidex.Infrastructure;
 
 namespace Squidex.Pipeline
diff --git a/src/Squidex/Areas/Api/EntityCreatedDto.cs b/src/Squidex/Pipeline/EntityCreatedDto.cs
similarity index 95%
rename from src/Squidex/Areas/Api/EntityCreatedDto.cs
rename to src/Squidex/Pipeline/EntityCreatedDto.cs
index b60d8dbb4..6534fc1cd 100644
--- a/src/Squidex/Areas/Api/EntityCreatedDto.cs
+++ b/src/Squidex/Pipeline/EntityCreatedDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api
+namespace Squidex.Pipeline
 {
     public sealed class EntityCreatedDto
     {
diff --git a/src/Squidex/Areas/Api/ErrorDto.cs b/src/Squidex/Pipeline/ErrorDto.cs
similarity index 96%
rename from src/Squidex/Areas/Api/ErrorDto.cs
rename to src/Squidex/Pipeline/ErrorDto.cs
index 177a96b04..427bfb109 100644
--- a/src/Squidex/Areas/Api/ErrorDto.cs
+++ b/src/Squidex/Pipeline/ErrorDto.cs
@@ -8,7 +8,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Squidex.Controllers.Api
+namespace Squidex.Pipeline
 {
     public sealed class ErrorDto
     {
diff --git a/src/Squidex/Pipeline/Swagger/SwaggerHelper.cs b/src/Squidex/Pipeline/Swagger/SwaggerHelper.cs
index 2a8ad2026..3d49bd437 100644
--- a/src/Squidex/Pipeline/Swagger/SwaggerHelper.cs
+++ b/src/Squidex/Pipeline/Swagger/SwaggerHelper.cs
@@ -17,7 +17,7 @@ using NJsonSchema;
 using NJsonSchema.Generation;
 using NSwag;
 using Squidex.Config;
-using Squidex.Controllers.Api;
+using Squidex.Areas.Api.Controllers;
 using Squidex.Shared.Identity;
 
 namespace Squidex.Pipeline.Swagger
diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj
index c35ba873f..ff84675ef 100644
--- a/src/Squidex/Squidex.csproj
+++ b/src/Squidex/Squidex.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Areas\IdentityServer\Config\Cert\*.*;Docs\*.md" />
-    <EmbeddedResource Include="Controllers\Api\Users\Assets\Avatar.png" />
+    <EmbeddedResource Include="Areas\Api\Users\Assets\Avatar.png" />
     <EmbeddedResource Remove="Assets\**" />
 
     <Compile Remove="Assets\**" />
@@ -82,6 +82,10 @@
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Controllers\" />
+  </ItemGroup>
+
   <Target Name="IncludeDocFile" BeforeTargets="PrepareForPublish">
     <ItemGroup Condition=" '$(DocumentationFile)' != '' ">
       <_DocumentationFile Include="$(DocumentationFile)" />