Namespaces adjusted.

src/Squidex.Infrastructure.GetEventStore/CQRS/Events/Formatter.cs

@@ -8,11 +8,9 @@
 
 using System.Text;
 using EventStore.ClientAPI;
-using Squidex.Infrastructure.CQRS.Events;
-using EventData = Squidex.Infrastructure.CQRS.Events.EventData;
 using EventStoreData = EventStore.ClientAPI.EventData;
 
-namespace Squidex.Infrastructure.GetEventStore
+namespace Squidex.Infrastructure.CQRS.Events
 {
     public static class Formatter
     {

src/Squidex.Infrastructure.GetEventStore/CQRS/Events/GetEventStore.cs

@@ -11,13 +11,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using EventStore.ClientAPI;
-using Squidex.Infrastructure.CQRS.Events;
-using EventData = Squidex.Infrastructure.CQRS.Events.EventData;
 
 // ReSharper disable ConvertIfStatementToSwitchStatement
 // ReSharper disable InvertIf
 
-namespace Squidex.Infrastructure.GetEventStore
+namespace Squidex.Infrastructure.CQRS.Events
 {
     public sealed class GetEventStore : IEventStore, IExternalSystem
     {

src/Squidex.Infrastructure.GetEventStore/CQRS/Events/GetEventStoreSubscription.cs

@@ -15,9 +15,8 @@ using System.Threading.Tasks;
 using EventStore.ClientAPI;
 using EventStore.ClientAPI.Exceptions;
 using EventStore.ClientAPI.Projections;
-using Squidex.Infrastructure.CQRS.Events;
 
-namespace Squidex.Infrastructure.GetEventStore
+namespace Squidex.Infrastructure.CQRS.Events
 {
     internal sealed class EventStoreSubscription : DisposableObjectBase, IEventSubscription
     {

src/Squidex.Infrastructure.GetEventStore/Squidex.Infrastructure.GetEventStore.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>
+    <RootNamespace>Squidex.Infrastructure</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>full</DebugType>

src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs

@@ -12,9 +12,8 @@ using System.Net;
 using System.Threading.Tasks;
 using Google;
 using Google.Cloud.Storage.V1;
-using Squidex.Infrastructure.Assets;
 
-namespace Squidex.Infrastructure.GoogleCloud
+namespace Squidex.Infrastructure.Assets
 {
     public sealed class GoogleCloudAssetStore : IAssetStore, IExternalSystem
     {

src/Squidex.Infrastructure.GoogleCloud/Squidex.Infrastructure.GoogleCloud.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>
+    <RootNamespace>Squidex.Infrastructure</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>full</DebugType>

src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEvent.cs

@@ -9,7 +9,7 @@
 using System;
 using MongoDB.Bson.Serialization.Attributes;
 
-namespace Squidex.Infrastructure.MongoDb.EventStore
+namespace Squidex.Infrastructure.CQRS.Events
 {
     public class MongoEvent
     {

src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventCommit.cs

@@ -10,7 +10,7 @@ using System;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 
-namespace Squidex.Infrastructure.MongoDb.EventStore
+namespace Squidex.Infrastructure.CQRS.Events
 {
     public sealed class MongoEventCommit
     {

src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventConsumerInfo.cs

@@ -8,9 +8,8 @@
 
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
-using Squidex.Infrastructure.CQRS.Events;
 
-namespace Squidex.Infrastructure.MongoDb.EventStore
+namespace Squidex.Infrastructure.CQRS.Events
 {
     public sealed class MongoEventConsumerInfo : IEventConsumerInfo
     {

src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventConsumerInfoRepository.cs

@@ -11,12 +11,12 @@ using System.Linq;
 using System.Threading.Tasks;
 using MongoDB.Bson;
 using MongoDB.Driver;
-using Squidex.Infrastructure.CQRS.Events;
+using Squidex.Infrastructure.MongoDb;
 
 // ReSharper disable ConvertIfStatementToReturnStatement
 // ReSharper disable RedundantIfElseBlock
 
-namespace Squidex.Infrastructure.MongoDb.EventStore
+namespace Squidex.Infrastructure.CQRS.Events
 {
     public sealed class MongoEventConsumerInfoRepository : MongoRepositoryBase<MongoEventConsumerInfo>, IEventConsumerInfoRepository
     {

src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventStore.cs

@@ -6,22 +6,22 @@
 //  All rights reserved.
 // ==========================================================================
 
-using MongoDB.Bson;
-using MongoDB.Driver;
-using Squidex.Infrastructure.CQRS.Events;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MongoDB.Bson;
+using MongoDB.Driver;
+using Squidex.Infrastructure.MongoDb;
 using Squidex.Infrastructure.Tasks;
 
 // ReSharper disable RedundantIfElseBlock
 // ReSharper disable InvertIf
 // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
 
-namespace Squidex.Infrastructure.MongoDb.EventStore
+namespace Squidex.Infrastructure.CQRS.Events
 {
     public class MongoEventStore : MongoRepositoryBase<MongoEventCommit>, IEventStore
     {

src/Squidex.Infrastructure.MongoDb/CQRS/Events/PollingSubscription.cs

@@ -8,13 +8,12 @@
 
 using System;
 using System.Threading.Tasks;
-using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Infrastructure.Tasks;
 using Squidex.Infrastructure.Timers;
 
 // ReSharper disable InvertIf
 
-namespace Squidex.Infrastructure.MongoDb.EventStore
+namespace Squidex.Infrastructure.CQRS.Events
 {
     public sealed class PollingSubscription : DisposableObjectBase, IEventSubscription
     {

src/Squidex.Infrastructure.MongoDb/CQRS/Events/StreamPosition.cs

@@ -10,7 +10,7 @@
 
 using MongoDB.Bson;
 
-namespace Squidex.Infrastructure.MongoDb.EventStore
+namespace Squidex.Infrastructure.CQRS.Events
 {
     public sealed class StreamPosition
     {

src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>
+    <RootNamespace>Squidex.Infrastructure</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>full</DebugType>

src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsage.cs

@@ -10,7 +10,7 @@ using System;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 
-namespace Squidex.Infrastructure.MongoDb.UsageTracker
+namespace Squidex.Infrastructure.UsageTracking
 {
     public sealed class MongoUsage
     {

src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsageStore.cs

@@ -11,9 +11,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using MongoDB.Driver;
-using Squidex.Infrastructure.UsageTracking;
+using Squidex.Infrastructure.MongoDb;
 
-namespace Squidex.Infrastructure.MongoDb.UsageTracker
+namespace Squidex.Infrastructure.UsageTracking
 {
     public sealed class MongoUsageStore : MongoRepositoryBase<MongoUsage>, IUsageStore
     {

src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs

@@ -11,12 +11,11 @@ using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using RabbitMQ.Client;
-using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Infrastructure.Tasks;
 
 // ReSharper disable InvertIf
 
-namespace Squidex.Infrastructure.RabbitMq
+namespace Squidex.Infrastructure.CQRS.Events
 {
     public sealed class RabbitMqEventConsumer : DisposableObjectBase, IExternalSystem, IEventConsumer
     {

src/Squidex.Infrastructure.RabbitMq/Squidex.Infrastructure.RabbitMq.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>
+    <RootNamespace>Squidex.Infrastructure</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>full</DebugType>

src/Squidex.Infrastructure.Redis/RedisPubSub.cs

@@ -11,7 +11,7 @@ using System.Collections.Concurrent;
 using Squidex.Infrastructure.Log;
 using StackExchange.Redis;
 
-namespace Squidex.Infrastructure.Redis
+namespace Squidex.Infrastructure
 {
     public class RedisPubSub : IPubSub, IExternalSystem
     {

src/Squidex.Infrastructure.Redis/RedisSubscription.cs

@@ -14,7 +14,7 @@ using StackExchange.Redis;
 
 // ReSharper disable InvertIf
 
-namespace Squidex.Infrastructure.Redis
+namespace Squidex.Infrastructure
 {
     internal sealed class RedisSubscription
     {

src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>
+    <RootNamespace>Squidex.Infrastructure</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>full</DebugType>

src/Squidex/Config/Domain/AssetStoreModule.cs

@@ -11,7 +11,6 @@ using Autofac;
 using Microsoft.Extensions.Configuration;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Assets;
-using Squidex.Infrastructure.GoogleCloud;
 using Squidex.Infrastructure.Log;
 
 // ReSharper disable InvertIf

src/Squidex/Config/Domain/EventPublishersModule.cs

@@ -12,7 +12,6 @@ using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS.Events;
-using Squidex.Infrastructure.RabbitMq;
 
 // ReSharper disable InvertIf
 

src/Squidex/Config/Domain/EventStoreModule.cs

@@ -14,8 +14,6 @@ using Microsoft.Extensions.Configuration;
 using MongoDB.Driver;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS.Events;
-using Squidex.Infrastructure.GetEventStore;
-using Squidex.Infrastructure.MongoDb.EventStore;
 
 namespace Squidex.Config.Domain
 {

src/Squidex/Config/Domain/PubSubModule.cs

@@ -11,7 +11,6 @@ using Autofac;
 using Autofac.Core;
 using Microsoft.Extensions.Configuration;
 using Squidex.Infrastructure;
-using Squidex.Infrastructure.Redis;
 using StackExchange.Redis;
 
 namespace Squidex.Config.Domain

src/Squidex/Config/Domain/StoreMongoDbModule.cs

@@ -30,8 +30,6 @@ using Squidex.Domain.Users.MongoDb;
 using Squidex.Domain.Users.MongoDb.Infrastructure;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS.Events;
-using Squidex.Infrastructure.MongoDb.EventStore;
-using Squidex.Infrastructure.MongoDb.UsageTracker;
 using Squidex.Infrastructure.UsageTracking;
 using Squidex.Shared.Users;
 

tests/Benchmarks/Tests/AppendToEventStore.cs

@@ -11,7 +11,6 @@ using Benchmarks.Utils;
 using MongoDB.Driver;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS.Events;
-using Squidex.Infrastructure.MongoDb.EventStore;
 
 namespace Benchmarks.Tests
 {

tests/Benchmarks/Tests/AppendToEventStoreWithManyWriters.cs

@@ -12,7 +12,6 @@ using Benchmarks.Utils;
 using MongoDB.Driver;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS.Events;
-using Squidex.Infrastructure.MongoDb.EventStore;
 
 namespace Benchmarks.Tests
 {

tests/Benchmarks/Tests/HandleEvents.cs

@@ -15,7 +15,6 @@ using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Infrastructure.Json;
 using Squidex.Infrastructure.Log;
-using Squidex.Infrastructure.MongoDb.EventStore;
 
 // ReSharper disable InvertIf
 

tests/Benchmarks/Tests/HandleEventsWithManyWriters.cs

@@ -16,7 +16,6 @@ using Squidex.Infrastructure;
 using Squidex.Infrastructure.CQRS.Events;
 using Squidex.Infrastructure.Json;
 using Squidex.Infrastructure.Log;
-using Squidex.Infrastructure.MongoDb.EventStore;
 
 // ReSharper disable InvertIf
 

tests/Squidex.Domain.Apps.Read.Tests/Schemas/ODataQueryTests.cs

@@ -18,15 +18,15 @@ using Squidex.Domain.Apps.Core;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Domain.Apps.Read.Apps;
 using Squidex.Domain.Apps.Read.Contents.Edm;
+using Squidex.Domain.Apps.Read.MongoDb.Contents;
 using Squidex.Domain.Apps.Read.MongoDb.Contents.Visitors;
-using Squidex.Domain.Apps.Read.Schemas;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.MongoDb;
 using Xunit;
 
 // ReSharper disable SpecifyACultureInStringConversionExplicitly
 
-namespace Squidex.Domain.Apps.Read.MongoDb.Contents
+namespace Squidex.Domain.Apps.Read.Schemas
 {
     public class ODataQueryTests
     {