diff --git a/src/Squidex.Infrastructure.GetEventStore/Formatter.cs b/src/Squidex.Infrastructure.GetEventStore/CQRS/Events/Formatter.cs
similarity index 100%
rename from src/Squidex.Infrastructure.GetEventStore/Formatter.cs
rename to src/Squidex.Infrastructure.GetEventStore/CQRS/Events/Formatter.cs
diff --git a/src/Squidex.Infrastructure.GetEventStore/GetEventStore.cs b/src/Squidex.Infrastructure.GetEventStore/CQRS/Events/GetEventStore.cs
similarity index 100%
rename from src/Squidex.Infrastructure.GetEventStore/GetEventStore.cs
rename to src/Squidex.Infrastructure.GetEventStore/CQRS/Events/GetEventStore.cs
diff --git a/src/Squidex.Infrastructure.GetEventStore/GetEventStoreSubscription.cs b/src/Squidex.Infrastructure.GetEventStore/CQRS/Events/GetEventStoreSubscription.cs
similarity index 100%
rename from src/Squidex.Infrastructure.GetEventStore/GetEventStoreSubscription.cs
rename to src/Squidex.Infrastructure.GetEventStore/CQRS/Events/GetEventStoreSubscription.cs
diff --git a/src/Squidex.Infrastructure.GoogleCloud/GoogleCloudAssetStore.cs b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs
similarity index 100%
rename from src/Squidex.Infrastructure.GoogleCloud/GoogleCloudAssetStore.cs
rename to src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/EventStore/MongoEvent.cs b/src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEvent.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/EventStore/MongoEvent.cs
rename to src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEvent.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/EventStore/MongoEventCommit.cs b/src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventCommit.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/EventStore/MongoEventCommit.cs
rename to src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventCommit.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/EventStore/MongoEventConsumerInfo.cs b/src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventConsumerInfo.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/EventStore/MongoEventConsumerInfo.cs
rename to src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventConsumerInfo.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/EventStore/MongoEventConsumerInfoRepository.cs b/src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventConsumerInfoRepository.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/EventStore/MongoEventConsumerInfoRepository.cs
rename to src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventConsumerInfoRepository.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/EventStore/MongoEventStore.cs b/src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventStore.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/EventStore/MongoEventStore.cs
rename to src/Squidex.Infrastructure.MongoDb/CQRS/Events/MongoEventStore.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/EventStore/PollingSubscription.cs b/src/Squidex.Infrastructure.MongoDb/CQRS/Events/PollingSubscription.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/EventStore/PollingSubscription.cs
rename to src/Squidex.Infrastructure.MongoDb/CQRS/Events/PollingSubscription.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/EventStore/StreamPosition.cs b/src/Squidex.Infrastructure.MongoDb/CQRS/Events/StreamPosition.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/EventStore/StreamPosition.cs
rename to src/Squidex.Infrastructure.MongoDb/CQRS/Events/StreamPosition.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/FieldDefinitionBuilder.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/FieldDefinitionBuilder.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/FieldDefinitionBuilder.cs
rename to src/Squidex.Infrastructure.MongoDb/MongoDb/FieldDefinitionBuilder.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/IMongoEntity.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/IMongoEntity.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/IMongoEntity.cs
rename to src/Squidex.Infrastructure.MongoDb/MongoDb/IMongoEntity.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/InstantSerializer.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/InstantSerializer.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/InstantSerializer.cs
rename to src/Squidex.Infrastructure.MongoDb/MongoDb/InstantSerializer.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/MongoEntity.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoEntity.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/MongoEntity.cs
rename to src/Squidex.Infrastructure.MongoDb/MongoDb/MongoEntity.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/MongoExtensions.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/MongoExtensions.cs
rename to src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/MongoRepositoryBase.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/MongoRepositoryBase.cs
rename to src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/RefTokenSerializer.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/RefTokenSerializer.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/RefTokenSerializer.cs
rename to src/Squidex.Infrastructure.MongoDb/MongoDb/RefTokenSerializer.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/UsageTracker/MongoUsage.cs b/src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsage.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/UsageTracker/MongoUsage.cs
rename to src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsage.cs
diff --git a/src/Squidex.Infrastructure.MongoDb/UsageTracker/MongoUsageStore.cs b/src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsageStore.cs
similarity index 100%
rename from src/Squidex.Infrastructure.MongoDb/UsageTracker/MongoUsageStore.cs
rename to src/Squidex.Infrastructure.MongoDb/UsageTracking/MongoUsageStore.cs
diff --git a/src/Squidex.Infrastructure.RabbitMq/RabbitMqEventConsumer.cs b/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs
similarity index 100%
rename from src/Squidex.Infrastructure.RabbitMq/RabbitMqEventConsumer.cs
rename to src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs