diff --git a/src/Api/Models/Response/EventResponseModel.cs b/src/Api/AdminConsole/Models/Response/EventResponseModel.cs
similarity index 100%
rename from src/Api/Models/Response/EventResponseModel.cs
rename to src/Api/AdminConsole/Models/Response/EventResponseModel.cs
diff --git a/src/Api/Models/Public/Request/EventFilterRequestModel.cs b/src/Api/AdminConsole/Public/Models/Request/EventFilterRequestModel.cs
similarity index 100%
rename from src/Api/Models/Public/Request/EventFilterRequestModel.cs
rename to src/Api/AdminConsole/Public/Models/Request/EventFilterRequestModel.cs
diff --git a/src/Api/Models/Public/Response/EventResponseModel.cs b/src/Api/AdminConsole/Public/Models/Response/EventResponseModel.cs
similarity index 100%
rename from src/Api/Models/Public/Response/EventResponseModel.cs
rename to src/Api/AdminConsole/Public/Models/Response/EventResponseModel.cs
diff --git a/src/Core/Services/IEventService.cs b/src/Core/AdminConsole/Services/IEventService.cs
similarity index 100%
rename from src/Core/Services/IEventService.cs
rename to src/Core/AdminConsole/Services/IEventService.cs
diff --git a/src/Core/Services/IEventWriteService.cs b/src/Core/AdminConsole/Services/IEventWriteService.cs
similarity index 100%
rename from src/Core/Services/IEventWriteService.cs
rename to src/Core/AdminConsole/Services/IEventWriteService.cs
diff --git a/src/Core/Services/Implementations/AzureQueueEventWriteService.cs b/src/Core/AdminConsole/Services/Implementations/AzureQueueEventWriteService.cs
similarity index 100%
rename from src/Core/Services/Implementations/AzureQueueEventWriteService.cs
rename to src/Core/AdminConsole/Services/Implementations/AzureQueueEventWriteService.cs
diff --git a/src/Core/Services/Implementations/EventService.cs b/src/Core/AdminConsole/Services/Implementations/EventService.cs
similarity index 100%
rename from src/Core/Services/Implementations/EventService.cs
rename to src/Core/AdminConsole/Services/Implementations/EventService.cs
diff --git a/src/Core/Services/NoopImplementations/NoopEventService.cs b/src/Core/AdminConsole/Services/NoopImplementations/NoopEventService.cs
similarity index 100%
rename from src/Core/Services/NoopImplementations/NoopEventService.cs
rename to src/Core/AdminConsole/Services/NoopImplementations/NoopEventService.cs
diff --git a/src/Core/Services/NoopImplementations/NoopEventWriteService.cs b/src/Core/AdminConsole/Services/NoopImplementations/NoopEventWriteService.cs
similarity index 100%
rename from src/Core/Services/NoopImplementations/NoopEventWriteService.cs
rename to src/Core/AdminConsole/Services/NoopImplementations/NoopEventWriteService.cs
diff --git a/src/Infrastructure.EntityFramework/Configurations/EventEntityTypeConfiguration.cs b/src/Infrastructure.EntityFramework/AdminConsole/Configurations/EventEntityTypeConfiguration.cs
similarity index 100%
rename from src/Infrastructure.EntityFramework/Configurations/EventEntityTypeConfiguration.cs
rename to src/Infrastructure.EntityFramework/AdminConsole/Configurations/EventEntityTypeConfiguration.cs
diff --git a/src/Infrastructure.EntityFramework/Models/Event.cs b/src/Infrastructure.EntityFramework/AdminConsole/Models/Event.cs
similarity index 100%
rename from src/Infrastructure.EntityFramework/Models/Event.cs
rename to src/Infrastructure.EntityFramework/AdminConsole/Models/Event.cs
diff --git a/test/Core.Test/Services/AzureQueueEventWriteServiceTests.cs b/test/Core.Test/AdminConsole/Services/AzureQueueEventWriteServiceTests.cs
similarity index 100%
rename from test/Core.Test/Services/AzureQueueEventWriteServiceTests.cs
rename to test/Core.Test/AdminConsole/Services/AzureQueueEventWriteServiceTests.cs
diff --git a/test/Core.Test/Services/EventServiceTests.cs b/test/Core.Test/AdminConsole/Services/EventServiceTests.cs
similarity index 100%
rename from test/Core.Test/Services/EventServiceTests.cs
rename to test/Core.Test/AdminConsole/Services/EventServiceTests.cs
diff --git a/test/Core.Test/Services/RepositoryEventWriteServiceTests.cs b/test/Core.Test/AdminConsole/Services/RepositoryEventWriteServiceTests.cs
similarity index 100%
rename from test/Core.Test/Services/RepositoryEventWriteServiceTests.cs
rename to test/Core.Test/AdminConsole/Services/RepositoryEventWriteServiceTests.cs
diff --git a/test/Infrastructure.EFIntegration.Test/AutoFixture/EventFixtures.cs b/test/Infrastructure.EFIntegration.Test/AdminConsole/Autofixture/EventFixtures.cs
similarity index 100%
rename from test/Infrastructure.EFIntegration.Test/AutoFixture/EventFixtures.cs
rename to test/Infrastructure.EFIntegration.Test/AdminConsole/Autofixture/EventFixtures.cs
diff --git a/test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/EventCompare.cs b/test/Infrastructure.EFIntegration.Test/AdminConsole/Repositories/EqualityComparers/EventCompare.cs
similarity index 100%
rename from test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/EventCompare.cs
rename to test/Infrastructure.EFIntegration.Test/AdminConsole/Repositories/EqualityComparers/EventCompare.cs