From 0abd52b5be2c82225f4099eca456b42bf0c5bc20 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Wed, 21 Feb 2024 09:18:09 +1000
Subject: [PATCH] [AC-1895] AC Team code ownership moves: Bitwarden Portal
 (#3528)

---------

Co-authored-by: Addison Beck <hello@addisonbeck.com>
---
 .../Controllers/OrganizationsController.cs               | 9 +++------
 .../Controllers/ProviderOrganizationsController.cs       | 2 +-
 .../Controllers/ProvidersController.cs                   | 6 +++---
 .../{ => AdminConsole}/Models/CreateProviderModel.cs     | 2 +-
 .../{ => AdminConsole}/Models/OrganizationEditModel.cs   | 2 +-
 .../Models/OrganizationSelectableViewModel.cs            | 2 +-
 .../OrganizationUnassignedToProviderSearchViewModel.cs   | 3 ++-
 .../{ => AdminConsole}/Models/OrganizationViewModel.cs   | 2 +-
 .../{ => AdminConsole}/Models/OrganizationsModel.cs      | 5 +++--
 src/Admin/{ => AdminConsole}/Models/ProviderEditModel.cs | 2 +-
 src/Admin/{ => AdminConsole}/Models/ProviderViewModel.cs | 2 +-
 src/Admin/{ => AdminConsole}/Models/ProvidersModel.cs    | 5 +++--
 .../Views/Organizations/Connections.cshtml               | 9 +++++----
 .../{ => AdminConsole}/Views/Organizations/Edit.cshtml   | 6 ++++--
 .../{ => AdminConsole}/Views/Organizations/Index.cshtml  | 0
 .../{ => AdminConsole}/Views/Organizations/View.cshtml   | 0
 .../Views/Organizations/_ProviderInformation.cshtml      | 0
 .../Views/Organizations/_ViewInformation.cshtml          | 0
 .../Views/Providers/AddExistingOrganization.cshtml       | 1 -
 .../{ => AdminConsole}/Views/Providers/Admins.cshtml     | 8 ++++----
 .../{ => AdminConsole}/Views/Providers/Create.cshtml     | 0
 .../Views/Providers/CreateOrganization.cshtml            | 4 ++--
 src/Admin/{ => AdminConsole}/Views/Providers/Edit.cshtml | 0
 .../{ => AdminConsole}/Views/Providers/Index.cshtml      | 0
 .../Views/Providers/Organizations.cshtml                 | 1 +
 src/Admin/{ => AdminConsole}/Views/Providers/View.cshtml | 0
 .../Views/Providers/_ProviderOrganizationScripts.cshtml  | 0
 .../Views/Providers/_ProviderScripts.cshtml              | 0
 .../Views/Providers/_ViewInformation.cshtml              | 6 +++---
 .../Views/Shared/_OrganizationForm.cshtml                | 3 ++-
 .../Views/Shared/_OrganizationFormScripts.cshtml         | 1 +
 src/Admin/AdminConsole/Views/_ViewImports.cshtml         | 5 +++++
 src/Admin/AdminConsole/Views/_ViewStart.cshtml           | 3 +++
 src/Admin/Startup.cs                                     | 1 +
 34 files changed, 52 insertions(+), 38 deletions(-)
 rename src/Admin/{ => AdminConsole}/Controllers/OrganizationsController.cs (98%)
 rename src/Admin/{ => AdminConsole}/Controllers/ProviderOrganizationsController.cs (98%)
 rename src/Admin/{ => AdminConsole}/Controllers/ProvidersController.cs (98%)
 rename src/Admin/{ => AdminConsole}/Models/CreateProviderModel.cs (98%)
 rename src/Admin/{ => AdminConsole}/Models/OrganizationEditModel.cs (99%)
 rename src/Admin/{ => AdminConsole}/Models/OrganizationSelectableViewModel.cs (78%)
 rename src/Admin/{ => AdminConsole}/Models/OrganizationUnassignedToProviderSearchViewModel.cs (84%)
 rename src/Admin/{ => AdminConsole}/Models/OrganizationViewModel.cs (98%)
 rename src/Admin/{ => AdminConsole}/Models/OrganizationsModel.cs (71%)
 rename src/Admin/{ => AdminConsole}/Models/ProviderEditModel.cs (96%)
 rename src/Admin/{ => AdminConsole}/Models/ProviderViewModel.cs (95%)
 rename src/Admin/{ => AdminConsole}/Models/ProvidersModel.cs (68%)
 rename src/Admin/{ => AdminConsole}/Views/Organizations/Connections.cshtml (95%)
 rename src/Admin/{ => AdminConsole}/Views/Organizations/Edit.cshtml (95%)
 rename src/Admin/{ => AdminConsole}/Views/Organizations/Index.cshtml (100%)
 rename src/Admin/{ => AdminConsole}/Views/Organizations/View.cshtml (100%)
 rename src/Admin/{ => AdminConsole}/Views/Organizations/_ProviderInformation.cshtml (100%)
 rename src/Admin/{ => AdminConsole}/Views/Organizations/_ViewInformation.cshtml (100%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/AddExistingOrganization.cshtml (98%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/Admins.cshtml (95%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/Create.cshtml (100%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/CreateOrganization.cshtml (79%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/Edit.cshtml (100%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/Index.cshtml (100%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/Organizations.cshtml (99%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/View.cshtml (100%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/_ProviderOrganizationScripts.cshtml (100%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/_ProviderScripts.cshtml (100%)
 rename src/Admin/{ => AdminConsole}/Views/Providers/_ViewInformation.cshtml (98%)
 rename src/Admin/{ => AdminConsole}/Views/Shared/_OrganizationForm.cshtml (99%)
 rename src/Admin/{ => AdminConsole}/Views/Shared/_OrganizationFormScripts.cshtml (99%)
 create mode 100644 src/Admin/AdminConsole/Views/_ViewImports.cshtml
 create mode 100644 src/Admin/AdminConsole/Views/_ViewStart.cshtml

diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/AdminConsole/Controllers/OrganizationsController.cs
similarity index 98%
rename from src/Admin/Controllers/OrganizationsController.cs
rename to src/Admin/AdminConsole/Controllers/OrganizationsController.cs
index 3fba88006d..ac4682edb6 100644
--- a/src/Admin/Controllers/OrganizationsController.cs
+++ b/src/Admin/AdminConsole/Controllers/OrganizationsController.cs
@@ -1,5 +1,5 @@
-using Bit.Admin.Enums;
-using Bit.Admin.Models;
+using Bit.Admin.AdminConsole.Models;
+using Bit.Admin.Enums;
 using Bit.Admin.Services;
 using Bit.Admin.Utilities;
 using Bit.Core.AdminConsole.Entities;
@@ -23,7 +23,7 @@ using Bit.Core.Vault.Repositories;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers;
+namespace Bit.Admin.AdminConsole.Controllers;
 
 [Authorize]
 public class OrganizationsController : Controller
@@ -38,7 +38,6 @@ public class OrganizationsController : Controller
     private readonly IGroupRepository _groupRepository;
     private readonly IPolicyRepository _policyRepository;
     private readonly IPaymentService _paymentService;
-    private readonly ILicensingService _licensingService;
     private readonly IApplicationCacheService _applicationCacheService;
     private readonly GlobalSettings _globalSettings;
     private readonly IReferenceEventService _referenceEventService;
@@ -65,7 +64,6 @@ public class OrganizationsController : Controller
         IGroupRepository groupRepository,
         IPolicyRepository policyRepository,
         IPaymentService paymentService,
-        ILicensingService licensingService,
         IApplicationCacheService applicationCacheService,
         GlobalSettings globalSettings,
         IReferenceEventService referenceEventService,
@@ -91,7 +89,6 @@ public class OrganizationsController : Controller
         _groupRepository = groupRepository;
         _policyRepository = policyRepository;
         _paymentService = paymentService;
-        _licensingService = licensingService;
         _applicationCacheService = applicationCacheService;
         _globalSettings = globalSettings;
         _referenceEventService = referenceEventService;
diff --git a/src/Admin/Controllers/ProviderOrganizationsController.cs b/src/Admin/AdminConsole/Controllers/ProviderOrganizationsController.cs
similarity index 98%
rename from src/Admin/Controllers/ProviderOrganizationsController.cs
rename to src/Admin/AdminConsole/Controllers/ProviderOrganizationsController.cs
index e21e1297f6..b2deede4a4 100644
--- a/src/Admin/Controllers/ProviderOrganizationsController.cs
+++ b/src/Admin/AdminConsole/Controllers/ProviderOrganizationsController.cs
@@ -8,7 +8,7 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers;
+namespace Bit.Admin.AdminConsole.Controllers;
 
 [Authorize]
 [SelfHosted(NotSelfHostedOnly = true)]
diff --git a/src/Admin/Controllers/ProvidersController.cs b/src/Admin/AdminConsole/Controllers/ProvidersController.cs
similarity index 98%
rename from src/Admin/Controllers/ProvidersController.cs
rename to src/Admin/AdminConsole/Controllers/ProvidersController.cs
index 9493428739..c228149ea2 100644
--- a/src/Admin/Controllers/ProvidersController.cs
+++ b/src/Admin/AdminConsole/Controllers/ProvidersController.cs
@@ -1,5 +1,5 @@
-using Bit.Admin.Enums;
-using Bit.Admin.Models;
+using Bit.Admin.AdminConsole.Models;
+using Bit.Admin.Enums;
 using Bit.Admin.Utilities;
 using Bit.Core;
 using Bit.Core.AdminConsole.Entities.Provider;
@@ -15,7 +15,7 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers;
+namespace Bit.Admin.AdminConsole.Controllers;
 
 [Authorize]
 [SelfHosted(NotSelfHostedOnly = true)]
diff --git a/src/Admin/Models/CreateProviderModel.cs b/src/Admin/AdminConsole/Models/CreateProviderModel.cs
similarity index 98%
rename from src/Admin/Models/CreateProviderModel.cs
rename to src/Admin/AdminConsole/Models/CreateProviderModel.cs
index 8eddd014cd..7efd34feb1 100644
--- a/src/Admin/Models/CreateProviderModel.cs
+++ b/src/Admin/AdminConsole/Models/CreateProviderModel.cs
@@ -3,7 +3,7 @@ using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.SharedWeb.Utilities;
 
-namespace Bit.Admin.Models;
+namespace Bit.Admin.AdminConsole.Models;
 
 public class CreateProviderModel : IValidatableObject
 {
diff --git a/src/Admin/Models/OrganizationEditModel.cs b/src/Admin/AdminConsole/Models/OrganizationEditModel.cs
similarity index 99%
rename from src/Admin/Models/OrganizationEditModel.cs
rename to src/Admin/AdminConsole/Models/OrganizationEditModel.cs
index 643b252f62..575bd34e46 100644
--- a/src/Admin/Models/OrganizationEditModel.cs
+++ b/src/Admin/AdminConsole/Models/OrganizationEditModel.cs
@@ -11,7 +11,7 @@ using Bit.Core.Utilities;
 using Bit.Core.Vault.Entities;
 using Bit.SharedWeb.Utilities;
 
-namespace Bit.Admin.Models;
+namespace Bit.Admin.AdminConsole.Models;
 
 public class OrganizationEditModel : OrganizationViewModel
 {
diff --git a/src/Admin/Models/OrganizationSelectableViewModel.cs b/src/Admin/AdminConsole/Models/OrganizationSelectableViewModel.cs
similarity index 78%
rename from src/Admin/Models/OrganizationSelectableViewModel.cs
rename to src/Admin/AdminConsole/Models/OrganizationSelectableViewModel.cs
index e43bb19723..2c148e04dd 100644
--- a/src/Admin/Models/OrganizationSelectableViewModel.cs
+++ b/src/Admin/AdminConsole/Models/OrganizationSelectableViewModel.cs
@@ -1,6 +1,6 @@
 using Bit.Core.AdminConsole.Entities;
 
-namespace Bit.Admin.Models;
+namespace Bit.Admin.AdminConsole.Models;
 
 public class OrganizationSelectableViewModel : Organization
 {
diff --git a/src/Admin/Models/OrganizationUnassignedToProviderSearchViewModel.cs b/src/Admin/AdminConsole/Models/OrganizationUnassignedToProviderSearchViewModel.cs
similarity index 84%
rename from src/Admin/Models/OrganizationUnassignedToProviderSearchViewModel.cs
rename to src/Admin/AdminConsole/Models/OrganizationUnassignedToProviderSearchViewModel.cs
index 73aee284c8..cbf15a4776 100644
--- a/src/Admin/Models/OrganizationUnassignedToProviderSearchViewModel.cs
+++ b/src/Admin/AdminConsole/Models/OrganizationUnassignedToProviderSearchViewModel.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Admin.Models;
 
-namespace Bit.Admin.Models;
+namespace Bit.Admin.AdminConsole.Models;
 
 public class OrganizationUnassignedToProviderSearchViewModel : PagedModel<OrganizationSelectableViewModel>
 {
diff --git a/src/Admin/Models/OrganizationViewModel.cs b/src/Admin/AdminConsole/Models/OrganizationViewModel.cs
similarity index 98%
rename from src/Admin/Models/OrganizationViewModel.cs
rename to src/Admin/AdminConsole/Models/OrganizationViewModel.cs
index 0bad3650fd..99cda6835f 100644
--- a/src/Admin/Models/OrganizationViewModel.cs
+++ b/src/Admin/AdminConsole/Models/OrganizationViewModel.cs
@@ -5,7 +5,7 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Vault.Entities;
 
-namespace Bit.Admin.Models;
+namespace Bit.Admin.AdminConsole.Models;
 
 public class OrganizationViewModel
 {
diff --git a/src/Admin/Models/OrganizationsModel.cs b/src/Admin/AdminConsole/Models/OrganizationsModel.cs
similarity index 71%
rename from src/Admin/Models/OrganizationsModel.cs
rename to src/Admin/AdminConsole/Models/OrganizationsModel.cs
index ea2a370d51..147c5275f8 100644
--- a/src/Admin/Models/OrganizationsModel.cs
+++ b/src/Admin/AdminConsole/Models/OrganizationsModel.cs
@@ -1,6 +1,7 @@
-using Bit.Core.AdminConsole.Entities;
+using Bit.Admin.Models;
+using Bit.Core.AdminConsole.Entities;
 
-namespace Bit.Admin.Models;
+namespace Bit.Admin.AdminConsole.Models;
 
 public class OrganizationsModel : PagedModel<Organization>
 {
diff --git a/src/Admin/Models/ProviderEditModel.cs b/src/Admin/AdminConsole/Models/ProviderEditModel.cs
similarity index 96%
rename from src/Admin/Models/ProviderEditModel.cs
rename to src/Admin/AdminConsole/Models/ProviderEditModel.cs
index b5219d8ed9..c00bdea6e5 100644
--- a/src/Admin/Models/ProviderEditModel.cs
+++ b/src/Admin/AdminConsole/Models/ProviderEditModel.cs
@@ -2,7 +2,7 @@
 using Bit.Core.AdminConsole.Entities.Provider;
 using Bit.Core.AdminConsole.Models.Data.Provider;
 
-namespace Bit.Admin.Models;
+namespace Bit.Admin.AdminConsole.Models;
 
 public class ProviderEditModel : ProviderViewModel
 {
diff --git a/src/Admin/Models/ProviderViewModel.cs b/src/Admin/AdminConsole/Models/ProviderViewModel.cs
similarity index 95%
rename from src/Admin/Models/ProviderViewModel.cs
rename to src/Admin/AdminConsole/Models/ProviderViewModel.cs
index 38e7eac4a2..9c4d07e8bf 100644
--- a/src/Admin/Models/ProviderViewModel.cs
+++ b/src/Admin/AdminConsole/Models/ProviderViewModel.cs
@@ -2,7 +2,7 @@
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Models.Data.Provider;
 
-namespace Bit.Admin.Models;
+namespace Bit.Admin.AdminConsole.Models;
 
 public class ProviderViewModel
 {
diff --git a/src/Admin/Models/ProvidersModel.cs b/src/Admin/AdminConsole/Models/ProvidersModel.cs
similarity index 68%
rename from src/Admin/Models/ProvidersModel.cs
rename to src/Admin/AdminConsole/Models/ProvidersModel.cs
index 5fb8e8dfab..6de815facf 100644
--- a/src/Admin/Models/ProvidersModel.cs
+++ b/src/Admin/AdminConsole/Models/ProvidersModel.cs
@@ -1,6 +1,7 @@
-using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Admin.Models;
+using Bit.Core.AdminConsole.Entities.Provider;
 
-namespace Bit.Admin.Models;
+namespace Bit.Admin.AdminConsole.Models;
 
 public class ProvidersModel : PagedModel<Provider>
 {
diff --git a/src/Admin/Views/Organizations/Connections.cshtml b/src/Admin/AdminConsole/Views/Organizations/Connections.cshtml
similarity index 95%
rename from src/Admin/Views/Organizations/Connections.cshtml
rename to src/Admin/AdminConsole/Views/Organizations/Connections.cshtml
index f1f8f4a8d3..6efdb34b20 100644
--- a/src/Admin/Views/Organizations/Connections.cshtml
+++ b/src/Admin/AdminConsole/Views/Organizations/Connections.cshtml
@@ -1,3 +1,4 @@
+@using Bit.Core.Enums
 @model OrganizationViewModel
 <h2>Connections</h2>
 <div class="row">
@@ -49,7 +50,7 @@
                                     }
                                 </td>
                                 <td>
-                                    @if(connection.Enabled) 
+                                    @if(connection.Enabled)
                                     {
                                         @if(@TempData["ConnectionActivated"] != null && @TempData["ConnectionActivated"].ToString() == @Model.Organization.Id.ToString())
                                         {
@@ -62,8 +63,8 @@
                                         {
                                             @if(connection.Type.Equals(OrganizationConnectionType.CloudBillingSync))
                                             {
-                                                <a class="btn btn-outline-secondary btn-sm" 
-                                                    data-id="@connection.Id" asp-controller="Organizations" 
+                                                <a class="btn btn-outline-secondary btn-sm"
+                                                    data-id="@connection.Id" asp-controller="Organizations"
                                                     asp-action="TriggerBillingSync" asp-route-id="@Model.Organization.Id">
                                                     Manually Sync
                                                 </a>
@@ -78,4 +79,4 @@
             </table>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Admin/Views/Organizations/Edit.cshtml b/src/Admin/AdminConsole/Views/Organizations/Edit.cshtml
similarity index 95%
rename from src/Admin/Views/Organizations/Edit.cshtml
rename to src/Admin/AdminConsole/Views/Organizations/Edit.cshtml
index ad4e4f8482..bed7c789ee 100644
--- a/src/Admin/Views/Organizations/Edit.cshtml
+++ b/src/Admin/AdminConsole/Views/Organizations/Edit.cshtml
@@ -1,4 +1,6 @@
 @using Bit.Admin.Enums;
+@using Bit.Admin.Models
+@using Bit.Core.Enums
 @inject Bit.Admin.Services.IAccessControlService AccessControlService
 @model OrganizationEditModel
 @{
@@ -12,7 +14,7 @@
 }
 
 @section Scripts {
-    @await Html.PartialAsync("_OrganizationFormScripts")
+    @await Html.PartialAsync("~/AdminConsole/Views/Shared/_OrganizationFormScripts.cshtml")
 
     <script>
         (() => {
@@ -77,7 +79,7 @@
         new BillingInformationModel { BillingInfo = Model.BillingInfo, OrganizationId = Model.Organization.Id, Entity = "Organization" })
 }
 
-@await Html.PartialAsync("_OrganizationForm", Model)
+@await Html.PartialAsync("~/AdminConsole/Views/Shared/_OrganizationForm.cshtml", Model)
 
 <div class="d-flex mt-4">
     <button type="submit" class="btn btn-primary" form="edit-form">Save</button>
diff --git a/src/Admin/Views/Organizations/Index.cshtml b/src/Admin/AdminConsole/Views/Organizations/Index.cshtml
similarity index 100%
rename from src/Admin/Views/Organizations/Index.cshtml
rename to src/Admin/AdminConsole/Views/Organizations/Index.cshtml
diff --git a/src/Admin/Views/Organizations/View.cshtml b/src/Admin/AdminConsole/Views/Organizations/View.cshtml
similarity index 100%
rename from src/Admin/Views/Organizations/View.cshtml
rename to src/Admin/AdminConsole/Views/Organizations/View.cshtml
diff --git a/src/Admin/Views/Organizations/_ProviderInformation.cshtml b/src/Admin/AdminConsole/Views/Organizations/_ProviderInformation.cshtml
similarity index 100%
rename from src/Admin/Views/Organizations/_ProviderInformation.cshtml
rename to src/Admin/AdminConsole/Views/Organizations/_ProviderInformation.cshtml
diff --git a/src/Admin/Views/Organizations/_ViewInformation.cshtml b/src/Admin/AdminConsole/Views/Organizations/_ViewInformation.cshtml
similarity index 100%
rename from src/Admin/Views/Organizations/_ViewInformation.cshtml
rename to src/Admin/AdminConsole/Views/Organizations/_ViewInformation.cshtml
diff --git a/src/Admin/Views/Providers/AddExistingOrganization.cshtml b/src/Admin/AdminConsole/Views/Providers/AddExistingOrganization.cshtml
similarity index 98%
rename from src/Admin/Views/Providers/AddExistingOrganization.cshtml
rename to src/Admin/AdminConsole/Views/Providers/AddExistingOrganization.cshtml
index 86ad5f7492..57605a8ec2 100644
--- a/src/Admin/Views/Providers/AddExistingOrganization.cshtml
+++ b/src/Admin/AdminConsole/Views/Providers/AddExistingOrganization.cshtml
@@ -1,5 +1,4 @@
 @using Bit.SharedWeb.Utilities
-@using Microsoft.AspNetCore.Mvc.TagHelpers
 @model OrganizationUnassignedToProviderSearchViewModel
 
 @{
diff --git a/src/Admin/Views/Providers/Admins.cshtml b/src/Admin/AdminConsole/Views/Providers/Admins.cshtml
similarity index 95%
rename from src/Admin/Views/Providers/Admins.cshtml
rename to src/Admin/AdminConsole/Views/Providers/Admins.cshtml
index 4d110aca5b..86043f3a6d 100644
--- a/src/Admin/Views/Providers/Admins.cshtml
+++ b/src/Admin/AdminConsole/Views/Providers/Admins.cshtml
@@ -38,7 +38,7 @@
                                     @admin.Status
                                 </td>
                                 <td>
-                                    @if(admin.Status.Equals(ProviderUserStatusType.Confirmed) 
+                                    @if(admin.Status.Equals(ProviderUserStatusType.Confirmed)
                                         && @Model.Provider.Status.Equals(ProviderStatusType.Pending)
                                         && canResendEmailInvite)
                                     {
@@ -48,9 +48,9 @@
                                         }
                                         else
                                         {
-                                            <a class="btn btn-outline-secondary btn-sm" 
-                                                data-id="@admin.Id" asp-controller="Providers" 
-                                                asp-action="ResendInvite" asp-route-ownerId="@admin.UserId" 
+                                            <a class="btn btn-outline-secondary btn-sm"
+                                                data-id="@admin.Id" asp-controller="Providers"
+                                                asp-action="ResendInvite" asp-route-ownerId="@admin.UserId"
                                                 asp-route-providerId="@Model.Provider.Id">
                                                 Resend Setup Invite
                                             </a>
diff --git a/src/Admin/Views/Providers/Create.cshtml b/src/Admin/AdminConsole/Views/Providers/Create.cshtml
similarity index 100%
rename from src/Admin/Views/Providers/Create.cshtml
rename to src/Admin/AdminConsole/Views/Providers/Create.cshtml
diff --git a/src/Admin/Views/Providers/CreateOrganization.cshtml b/src/Admin/AdminConsole/Views/Providers/CreateOrganization.cshtml
similarity index 79%
rename from src/Admin/Views/Providers/CreateOrganization.cshtml
rename to src/Admin/AdminConsole/Views/Providers/CreateOrganization.cshtml
index e4298960a0..cb7913cd9a 100644
--- a/src/Admin/Views/Providers/CreateOrganization.cshtml
+++ b/src/Admin/AdminConsole/Views/Providers/CreateOrganization.cshtml
@@ -4,7 +4,7 @@
 }
 
 @section Scripts {
-    @await Html.PartialAsync("_OrganizationFormScripts")
+    @await Html.PartialAsync("~/AdminConsole/Views/Shared/_OrganizationFormScripts.cshtml")
 
     <script>
         (() => {
@@ -15,7 +15,7 @@
 
 <h1>New Client Organization</h1>
 
-@await Html.PartialAsync("_OrganizationForm", Model)
+@await Html.PartialAsync("~/AdminConsole/Views/Shared/_OrganizationForm.cshtml", Model)
 <div class="d-flex mt-4">
     <button type="submit" class="btn btn-primary" form="edit-form">Save</button>
     <div class="ml-auto d-flex">
diff --git a/src/Admin/Views/Providers/Edit.cshtml b/src/Admin/AdminConsole/Views/Providers/Edit.cshtml
similarity index 100%
rename from src/Admin/Views/Providers/Edit.cshtml
rename to src/Admin/AdminConsole/Views/Providers/Edit.cshtml
diff --git a/src/Admin/Views/Providers/Index.cshtml b/src/Admin/AdminConsole/Views/Providers/Index.cshtml
similarity index 100%
rename from src/Admin/Views/Providers/Index.cshtml
rename to src/Admin/AdminConsole/Views/Providers/Index.cshtml
diff --git a/src/Admin/Views/Providers/Organizations.cshtml b/src/Admin/AdminConsole/Views/Providers/Organizations.cshtml
similarity index 99%
rename from src/Admin/Views/Providers/Organizations.cshtml
rename to src/Admin/AdminConsole/Views/Providers/Organizations.cshtml
index 51356a3916..258c5f6dcf 100644
--- a/src/Admin/Views/Providers/Organizations.cshtml
+++ b/src/Admin/AdminConsole/Views/Providers/Organizations.cshtml
@@ -1,6 +1,7 @@
 @using Bit.Core.AdminConsole.Enums.Provider
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @using Bit.Admin.Enums
+@using Bit.Core.Enums
 @inject Bit.Admin.Services.IAccessControlService AccessControlService
 @model ProviderViewModel
 
diff --git a/src/Admin/Views/Providers/View.cshtml b/src/Admin/AdminConsole/Views/Providers/View.cshtml
similarity index 100%
rename from src/Admin/Views/Providers/View.cshtml
rename to src/Admin/AdminConsole/Views/Providers/View.cshtml
diff --git a/src/Admin/Views/Providers/_ProviderOrganizationScripts.cshtml b/src/Admin/AdminConsole/Views/Providers/_ProviderOrganizationScripts.cshtml
similarity index 100%
rename from src/Admin/Views/Providers/_ProviderOrganizationScripts.cshtml
rename to src/Admin/AdminConsole/Views/Providers/_ProviderOrganizationScripts.cshtml
diff --git a/src/Admin/Views/Providers/_ProviderScripts.cshtml b/src/Admin/AdminConsole/Views/Providers/_ProviderScripts.cshtml
similarity index 100%
rename from src/Admin/Views/Providers/_ProviderScripts.cshtml
rename to src/Admin/AdminConsole/Views/Providers/_ProviderScripts.cshtml
diff --git a/src/Admin/Views/Providers/_ViewInformation.cshtml b/src/Admin/AdminConsole/Views/Providers/_ViewInformation.cshtml
similarity index 98%
rename from src/Admin/Views/Providers/_ViewInformation.cshtml
rename to src/Admin/AdminConsole/Views/Providers/_ViewInformation.cshtml
index b01502e6d6..5d18d7a651 100644
--- a/src/Admin/Views/Providers/_ViewInformation.cshtml
+++ b/src/Admin/AdminConsole/Views/Providers/_ViewInformation.cshtml
@@ -7,13 +7,13 @@
 
     <dt class="col-sm-4 col-lg-3">Status</dt>
     <dd class="col-sm-8 col-lg-9">@Model.Provider.Status</dd>
-    
+
     <dt class="col-sm-4 col-lg-3">Users</dt>
     <dd class="col-sm-8 col-lg-9">@(Model.Provider.Type == ProviderType.Reseller ? "N/A" : Model.UserCount)</dd>
-    
+
     <dt class="col-sm-4 col-lg-3">Provider Type</dt>
     <dd class="col-sm-8 col-lg-9">@(Model.Provider.Type.GetDisplayAttribute()?.GetName())</dd>
-    
+
     <dt class="col-sm-4 col-lg-3">Created</dt>
     <dd class="col-sm-8 col-lg-9">@Model.Provider.CreationDate.ToString()</dd>
 
diff --git a/src/Admin/Views/Shared/_OrganizationForm.cshtml b/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
similarity index 99%
rename from src/Admin/Views/Shared/_OrganizationForm.cshtml
rename to src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
index 1438a5aa8c..fc0834521a 100644
--- a/src/Admin/Views/Shared/_OrganizationForm.cshtml
+++ b/src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
@@ -1,6 +1,7 @@
-@using Bit.SharedWeb.Utilities
 @using Bit.Admin.Enums;
+@using Bit.Core.Enums
 @using Bit.Core.AdminConsole.Enums.Provider
+@using Bit.SharedWeb.Utilities
 @inject Bit.Admin.Services.IAccessControlService AccessControlService;
 
 @model OrganizationEditModel
diff --git a/src/Admin/Views/Shared/_OrganizationFormScripts.cshtml b/src/Admin/AdminConsole/Views/Shared/_OrganizationFormScripts.cshtml
similarity index 99%
rename from src/Admin/Views/Shared/_OrganizationFormScripts.cshtml
rename to src/Admin/AdminConsole/Views/Shared/_OrganizationFormScripts.cshtml
index 68de025538..a84cf92c6a 100644
--- a/src/Admin/Views/Shared/_OrganizationFormScripts.cshtml
+++ b/src/Admin/AdminConsole/Views/Shared/_OrganizationFormScripts.cshtml
@@ -1,5 +1,6 @@
 @inject IWebHostEnvironment HostingEnvironment
 @using Bit.Admin.Utilities
+@using Bit.Core.Enums
 @model OrganizationEditModel
 
 <script>
diff --git a/src/Admin/AdminConsole/Views/_ViewImports.cshtml b/src/Admin/AdminConsole/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..02423ba0e7
--- /dev/null
+++ b/src/Admin/AdminConsole/Views/_ViewImports.cshtml
@@ -0,0 +1,5 @@
+@using Microsoft.AspNetCore.Identity
+@using Bit.Admin.AdminConsole
+@using Bit.Admin.AdminConsole.Models
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper "*, Admin"
diff --git a/src/Admin/AdminConsole/Views/_ViewStart.cshtml b/src/Admin/AdminConsole/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Admin/AdminConsole/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Admin/Startup.cs b/src/Admin/Startup.cs
index 7b806dce3f..db870266cc 100644
--- a/src/Admin/Startup.cs
+++ b/src/Admin/Startup.cs
@@ -107,6 +107,7 @@ public class Startup
         services.Configure<RazorViewEngineOptions>(o =>
          {
              o.ViewLocationFormats.Add("/Auth/Views/{1}/{0}.cshtml");
+             o.ViewLocationFormats.Add("/AdminConsole/Views/{1}/{0}.cshtml");
          });
 
         // Jobs service