diff --git a/src/Core/Context/CurrentContextOrganization.cs b/src/Core/AdminConsole/Context/CurrentContextOrganization.cs
similarity index 100%
rename from src/Core/Context/CurrentContextOrganization.cs
rename to src/Core/AdminConsole/Context/CurrentContextOrganization.cs
diff --git a/src/Core/Enums/OrganizationStatusType.cs b/src/Core/AdminConsole/Enums/OrganizationStatusType.cs
similarity index 100%
rename from src/Core/Enums/OrganizationStatusType.cs
rename to src/Core/AdminConsole/Enums/OrganizationStatusType.cs
diff --git a/src/Core/Models/Data/Organizations/OrganizationAbility.cs b/src/Core/AdminConsole/Models/Data/Organizations/OrganizationAbility.cs
similarity index 100%
rename from src/Core/Models/Data/Organizations/OrganizationAbility.cs
rename to src/Core/AdminConsole/Models/Data/Organizations/OrganizationAbility.cs
diff --git a/src/Core/Models/Data/Organizations/SelfHostedOrganizationDetails.cs b/src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs
similarity index 100%
rename from src/Core/Models/Data/Organizations/SelfHostedOrganizationDetails.cs
rename to src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs
diff --git a/src/Core/Repositories/IOrganizationRepository.cs b/src/Core/AdminConsole/Repositories/IOrganizationRepository.cs
similarity index 100%
rename from src/Core/Repositories/IOrganizationRepository.cs
rename to src/Core/AdminConsole/Repositories/IOrganizationRepository.cs
diff --git a/src/Core/Services/IOrganizationService.cs b/src/Core/AdminConsole/Services/IOrganizationService.cs
similarity index 100%
rename from src/Core/Services/IOrganizationService.cs
rename to src/Core/AdminConsole/Services/IOrganizationService.cs
diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
similarity index 100%
rename from src/Core/Services/Implementations/OrganizationService.cs
rename to src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
diff --git a/src/Infrastructure.Dapper/Repositories/OrganizationRepository.cs b/src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationRepository.cs
similarity index 100%
rename from src/Infrastructure.Dapper/Repositories/OrganizationRepository.cs
rename to src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationRepository.cs
diff --git a/src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs
similarity index 100%
rename from src/Infrastructure.EntityFramework/Repositories/OrganizationRepository.cs
rename to src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationRepository.cs
diff --git a/test/Core.Test/Entities/OrganizationTests.cs b/test/Core.Test/AdminConsole/Entities/OrganizationTests.cs
similarity index 100%
rename from test/Core.Test/Entities/OrganizationTests.cs
rename to test/Core.Test/AdminConsole/Entities/OrganizationTests.cs
diff --git a/test/Core.Test/Models/Data/SelfHostedOrganizationDetailsTests.cs b/test/Core.Test/AdminConsole/Models/Data/SelfHostedOrganizationDetailsTests.cs
similarity index 100%
rename from test/Core.Test/Models/Data/SelfHostedOrganizationDetailsTests.cs
rename to test/Core.Test/AdminConsole/Models/Data/SelfHostedOrganizationDetailsTests.cs
diff --git a/test/Core.Test/Services/OrganizationServiceTests.cs b/test/Core.Test/AdminConsole/Services/OrganizationServiceTests.cs
similarity index 100%
rename from test/Core.Test/Services/OrganizationServiceTests.cs
rename to test/Core.Test/AdminConsole/Services/OrganizationServiceTests.cs
diff --git a/test/Infrastructure.EFIntegration.Test/Repositories/OrganizationRepositoryTests.cs b/test/Infrastructure.EFIntegration.Test/AdminConsole/Repositories/OrganizationRepositoryTests.cs
similarity index 100%
rename from test/Infrastructure.EFIntegration.Test/Repositories/OrganizationRepositoryTests.cs
rename to test/Infrastructure.EFIntegration.Test/AdminConsole/Repositories/OrganizationRepositoryTests.cs