Files moved.

src/Squidex/Areas/Api/ControllerBase.cs → 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();
+            }
+        }
     }
 }

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)

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;
 

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)

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;

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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;

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;

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
     {

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
     {

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
     {

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
     {

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
     {

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;

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;

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
     {

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
     {

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
     {

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
     {

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)]

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
     {

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");
         }

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
     {

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;
 

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
     {

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
     {

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
     {

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>

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>

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;

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
     {

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
     {

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
     {

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
     {

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

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>
     {

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
     {

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>
     {

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
     {

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))]

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
     {

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
     {

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
     {

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))]

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

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
     {

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
     {

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;

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
     {

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
     {

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>
     {

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
     {

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
     {

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
     {

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
     {

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))]

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

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

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

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

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

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

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

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

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

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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)

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;
 

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
     {

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
     {

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
     {

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
     {

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;

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
     {

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
     {

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;
         }

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
     {

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
     {

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
     {

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
     {

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
     {

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;

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;