diff --git a/Controllers/Vehicle/ServiceController.cs b/Controllers/Vehicle/ServiceController.cs
index 1ab9ccb..b2a7798 100644
--- a/Controllers/Vehicle/ServiceController.cs
+++ b/Controllers/Vehicle/ServiceController.cs
@@ -21,7 +21,7 @@ namespace CarCareTracker.Controllers
             {
                 result = result.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
             }
-            return PartialView("_ServiceRecords", result);
+            return PartialView("Service/_ServiceRecords", result);
         }
         [HttpPost]
         public IActionResult SaveServiceRecordToVehicleId(ServiceRecordInput serviceRecord)
@@ -73,7 +73,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddServiceRecordPartialView()
         {
-            return PartialView("_ServiceRecordModal", new ServiceRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.ServiceRecord).ExtraFields });
+            return PartialView("Service/_ServiceRecordModal", new ServiceRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.ServiceRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetServiceRecordForEditById(int serviceRecordId)
@@ -99,7 +99,7 @@ namespace CarCareTracker.Controllers
                 RequisitionHistory = result.RequisitionHistory,
                 ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.ServiceRecord).ExtraFields)
             };
-            return PartialView("_ServiceRecordModal", convertedResult);
+            return PartialView("Service/_ServiceRecordModal", convertedResult);
         }
         private bool DeleteServiceRecordWithChecks(int serviceRecordId)
         {
diff --git a/Controllers/Vehicle/SupplyController.cs b/Controllers/Vehicle/SupplyController.cs
index b742fc4..5277d76 100644
--- a/Controllers/Vehicle/SupplyController.cs
+++ b/Controllers/Vehicle/SupplyController.cs
@@ -88,7 +88,7 @@ namespace CarCareTracker.Controllers
             {
                 result = result.OrderBy(x => x.Date).ToList();
             }
-            return PartialView("_SupplyRecords", result);
+            return PartialView("Supply/_SupplyRecords", result);
         }
         [HttpGet]
         public IActionResult GetSupplyRecordsForPlanRecordTemplate(int planRecordTemplateId)
@@ -115,7 +115,7 @@ namespace CarCareTracker.Controllers
                 viewModel.Supplies = supplies;
                 viewModel.Usage = planRecordTemplate.Supplies;
             }
-            return PartialView("_SupplyUsage", viewModel);
+            return PartialView("Supply/_SupplyUsage", viewModel);
         }
         [TypeFilter(typeof(CollaboratorFilter))]
         [HttpGet]
@@ -140,7 +140,7 @@ namespace CarCareTracker.Controllers
             {
                 Supplies = result
             };
-            return PartialView("_SupplyUsage", viewModel);
+            return PartialView("Supply/_SupplyUsage", viewModel);
         }
         [HttpPost]
         public IActionResult SaveSupplyRecordToVehicleId(SupplyRecordInput supplyRecord)
@@ -157,7 +157,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddSupplyRecordPartialView()
         {
-            return PartialView("_SupplyRecordModal", new SupplyRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields });
+            return PartialView("Supply/_SupplyRecordModal", new SupplyRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetSupplyRecordForEditById(int supplyRecordId)
@@ -185,7 +185,7 @@ namespace CarCareTracker.Controllers
                 RequisitionHistory = result.RequisitionHistory,
                 ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields)
             };
-            return PartialView("_SupplyRecordModal", convertedResult);
+            return PartialView("Supply/_SupplyRecordModal", convertedResult);
         }
         private bool DeleteSupplyRecordWithChecks(int supplyRecordId)
         {
diff --git a/Controllers/Vehicle/TaxController.cs b/Controllers/Vehicle/TaxController.cs
index 8eef08d..b0a3df3 100644
--- a/Controllers/Vehicle/TaxController.cs
+++ b/Controllers/Vehicle/TaxController.cs
@@ -21,7 +21,7 @@ namespace CarCareTracker.Controllers
             {
                 result = result.OrderBy(x => x.Date).ToList();
             }
-            return PartialView("_TaxRecords", result);
+            return PartialView("Tax/_TaxRecords", result);
         }
 
         [TypeFilter(typeof(CollaboratorFilter))]
@@ -67,7 +67,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddTaxRecordPartialView()
         {
-            return PartialView("_TaxRecordModal", new TaxRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields });
+            return PartialView("Tax/_TaxRecordModal", new TaxRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetTaxRecordForEditById(int taxRecordId)
@@ -95,7 +95,7 @@ namespace CarCareTracker.Controllers
                 Tags = result.Tags,
                 ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields)
             };
-            return PartialView("_TaxRecordModal", convertedResult);
+            return PartialView("Tax/_TaxRecordModal", convertedResult);
         }
         private bool DeleteTaxRecordWithChecks(int taxRecordId)
         {
diff --git a/Controllers/Vehicle/UpgradeController.cs b/Controllers/Vehicle/UpgradeController.cs
index 6992466..f94921f 100644
--- a/Controllers/Vehicle/UpgradeController.cs
+++ b/Controllers/Vehicle/UpgradeController.cs
@@ -21,7 +21,7 @@ namespace CarCareTracker.Controllers
             {
                 result = result.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
             }
-            return PartialView("_UpgradeRecords", result);
+            return PartialView("Upgrade/_UpgradeRecords", result);
         }
         [HttpPost]
         public IActionResult SaveUpgradeRecordToVehicleId(UpgradeRecordInput upgradeRecord)
@@ -73,7 +73,7 @@ namespace CarCareTracker.Controllers
         [HttpGet]
         public IActionResult GetAddUpgradeRecordPartialView()
         {
-            return PartialView("_UpgradeRecordModal", new UpgradeRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.UpgradeRecord).ExtraFields });
+            return PartialView("Upgrade/_UpgradeRecordModal", new UpgradeRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.UpgradeRecord).ExtraFields });
         }
         [HttpGet]
         public IActionResult GetUpgradeRecordForEditById(int upgradeRecordId)
@@ -99,7 +99,7 @@ namespace CarCareTracker.Controllers
                 RequisitionHistory = result.RequisitionHistory,
                 ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.UpgradeRecord).ExtraFields)
             };
-            return PartialView("_UpgradeRecordModal", convertedResult);
+            return PartialView("Upgrade/_UpgradeRecordModal", convertedResult);
         }
         private bool DeleteUpgradeRecordWithChecks(int upgradeRecordId)
         {
diff --git a/Views/Vehicle/Collision/_CollisionRecordModal.cshtml b/Views/Vehicle/Collision/_CollisionRecordModal.cshtml
index 70f3f2d..434cab4 100644
--- a/Views/Vehicle/Collision/_CollisionRecordModal.cshtml
+++ b/Views/Vehicle/Collision/_CollisionRecordModal.cshtml
@@ -44,7 +44,7 @@
                     }
                     <label for="collisionRecordCost">@translator.Translate(userLanguage, "Cost")</label>
                     <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="collisionRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the repair")" value="@(isNew ? "" : Model.Cost)">
-                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "RepairRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
+                    @await Html.PartialAsync("Supply/_SupplyStore", new SupplyStore { Tab = "RepairRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="collisionRecordTag">@translator.Translate(userLanguage, "Tags(optional)")</label>
                     <select multiple class="form-select" id="collisionRecordTag">
                         @foreach (string tag in Model.Tags)
@@ -105,7 +105,7 @@
         <button type="button" class="btn btn-primary" onclick="saveCollisionRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Repair Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "collisionRecordCost" })
+@await Html.PartialAsync("Supply/_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "collisionRecordCost" })
 <script>
     var selectedSupplies = [];
     var copySuppliesAttachments = false;
diff --git a/Views/Vehicle/Plan/_PlanRecordModal.cshtml b/Views/Vehicle/Plan/_PlanRecordModal.cshtml
index 0628313..1b82722 100644
--- a/Views/Vehicle/Plan/_PlanRecordModal.cshtml
+++ b/Views/Vehicle/Plan/_PlanRecordModal.cshtml
@@ -21,7 +21,7 @@
                     <input type="text" id="planRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage, "Describe the Plan")" value="@Model.Description">
                     <label for="planRecordCost">@translator.Translate(userLanguage, "Cost")</label>
                     <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
-                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "PlanRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
+                    @await Html.PartialAsync("Supply/_SupplyStore", new SupplyStore { Tab = "PlanRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="planRecordType">@translator.Translate(userLanguage, "Type")</label>
                     <select class="form-select" id="planRecordType">
                         <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Service")</!option>
@@ -87,7 +87,7 @@
         <button type="button" class="btn btn-primary" onclick="savePlanRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Plan Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "planRecordCost" })
+@await Html.PartialAsync("Supply/_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "planRecordCost" })
 <script>
     var selectedSupplies = [];
     var copySuppliesAttachments = false;
diff --git a/Views/Vehicle/Plan/_PlanRecordTemplateEditModal.cshtml b/Views/Vehicle/Plan/_PlanRecordTemplateEditModal.cshtml
index 25a3ab4..b70fbc4 100644
--- a/Views/Vehicle/Plan/_PlanRecordTemplateEditModal.cshtml
+++ b/Views/Vehicle/Plan/_PlanRecordTemplateEditModal.cshtml
@@ -21,7 +21,7 @@
                     <input type="text" id="planRecordDescription" class="form-control" placeholder="@translator.Translate(userLanguage, "Describe the Plan")" value="@Model.Description">
                     <label for="planRecordCost">@translator.Translate(userLanguage, "Cost")</label>
                     <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="planRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage, "Cost of the Plan")" value="@Model.Cost">
-                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "PlanRecordTemplate", AdditionalSupplies = Model.RequisitionHistory.Any() })
+                    @await Html.PartialAsync("Supply/_SupplyStore", new SupplyStore { Tab = "PlanRecordTemplate", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="planRecordType">@translator.Translate(userLanguage, "Type")</label>
                     <select class="form-select" id="planRecordType">
                         <!option value="ServiceRecord" @(Model.ImportMode == ImportMode.ServiceRecord || isNew ? "selected" : "")>@translator.Translate(userLanguage, "Service")</!option>
@@ -67,7 +67,7 @@
     <button type="button" class="btn btn-secondary" onclick="hideAddPlanRecordModal()">@translator.Translate(userLanguage, "Cancel")</button>
     <button type="button" class="btn btn-primary" onclick="savePlanRecordTemplate(true)">@translator.Translate(userLanguage, "Edit Plan Record Template")</button>
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "planRecordCost" })
+@await Html.PartialAsync("Supply/_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "planRecordCost" })
 <script>
     var selectedSupplies = [];
     var copySuppliesAttachments = @Model.CopySuppliesAttachment.ToString().ToLower();
diff --git a/Views/Vehicle/_ServiceRecordModal.cshtml b/Views/Vehicle/Service/_ServiceRecordModal.cshtml
similarity index 95%
rename from Views/Vehicle/_ServiceRecordModal.cshtml
rename to Views/Vehicle/Service/_ServiceRecordModal.cshtml
index 3eccb22..bd76a0b 100644
--- a/Views/Vehicle/_ServiceRecordModal.cshtml
+++ b/Views/Vehicle/Service/_ServiceRecordModal.cshtml
@@ -44,7 +44,7 @@
                     }
                     <label for="serviceRecordCost">@translator.Translate(userLanguage,"Cost")</label>
                     <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="serviceRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the service")" value="@(isNew ? "" : Model.Cost)">
-                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "ServiceRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
+                    @await Html.PartialAsync("Supply/_SupplyStore", new SupplyStore { Tab = "ServiceRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="serviceRecordTag">@translator.Translate(userLanguage,"Tags(optional)")</label>
                     <select multiple class="form-select" id="serviceRecordTag">
                         @foreach(string tag in Model.Tags)
@@ -105,7 +105,7 @@
         <button type="button" class="btn btn-primary" onclick="saveServiceRecordToVehicle(true)">@translator.Translate(userLanguage,"Edit Service Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "serviceRecordCost" })
+@await Html.PartialAsync("Supply/_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "serviceRecordCost" })
 <script>
     var selectedSupplies = [];
     var recurringReminderRecordId = [];
diff --git a/Views/Vehicle/_ServiceRecords.cshtml b/Views/Vehicle/Service/_ServiceRecords.cshtml
similarity index 100%
rename from Views/Vehicle/_ServiceRecords.cshtml
rename to Views/Vehicle/Service/_ServiceRecords.cshtml
diff --git a/Views/Vehicle/_SupplyRecordModal.cshtml b/Views/Vehicle/Supply/_SupplyRecordModal.cshtml
similarity index 97%
rename from Views/Vehicle/_SupplyRecordModal.cshtml
rename to Views/Vehicle/Supply/_SupplyRecordModal.cshtml
index 76319df..3409d68 100644
--- a/Views/Vehicle/_SupplyRecordModal.cshtml
+++ b/Views/Vehicle/Supply/_SupplyRecordModal.cshtml
@@ -84,7 +84,7 @@
         <button type="button" class="btn btn-primary" onclick="saveSupplyRecordToVehicle(true)">@translator.Translate(userLanguage,"Edit Supply Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "" })
+@await Html.PartialAsync("Supply/_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "" })
 <script>
     function getSupplyRecordModelData() {
         return { id: @Model.Id}
diff --git a/Views/Vehicle/_SupplyRecords.cshtml b/Views/Vehicle/Supply/_SupplyRecords.cshtml
similarity index 100%
rename from Views/Vehicle/_SupplyRecords.cshtml
rename to Views/Vehicle/Supply/_SupplyRecords.cshtml
diff --git a/Views/Vehicle/_SupplyRequisitionHistory.cshtml b/Views/Vehicle/Supply/_SupplyRequisitionHistory.cshtml
similarity index 100%
rename from Views/Vehicle/_SupplyRequisitionHistory.cshtml
rename to Views/Vehicle/Supply/_SupplyRequisitionHistory.cshtml
diff --git a/Views/Vehicle/_SupplyStore.cshtml b/Views/Vehicle/Supply/_SupplyStore.cshtml
similarity index 100%
rename from Views/Vehicle/_SupplyStore.cshtml
rename to Views/Vehicle/Supply/_SupplyStore.cshtml
diff --git a/Views/Vehicle/_SupplyUsage.cshtml b/Views/Vehicle/Supply/_SupplyUsage.cshtml
similarity index 100%
rename from Views/Vehicle/_SupplyUsage.cshtml
rename to Views/Vehicle/Supply/_SupplyUsage.cshtml
diff --git a/Views/Vehicle/_TaxRecordModal.cshtml b/Views/Vehicle/Tax/_TaxRecordModal.cshtml
similarity index 100%
rename from Views/Vehicle/_TaxRecordModal.cshtml
rename to Views/Vehicle/Tax/_TaxRecordModal.cshtml
diff --git a/Views/Vehicle/_TaxRecords.cshtml b/Views/Vehicle/Tax/_TaxRecords.cshtml
similarity index 100%
rename from Views/Vehicle/_TaxRecords.cshtml
rename to Views/Vehicle/Tax/_TaxRecords.cshtml
diff --git a/Views/Vehicle/_UpgradeRecordModal.cshtml b/Views/Vehicle/Upgrade/_UpgradeRecordModal.cshtml
similarity index 95%
rename from Views/Vehicle/_UpgradeRecordModal.cshtml
rename to Views/Vehicle/Upgrade/_UpgradeRecordModal.cshtml
index cfcb5cc..29d2def 100644
--- a/Views/Vehicle/_UpgradeRecordModal.cshtml
+++ b/Views/Vehicle/Upgrade/_UpgradeRecordModal.cshtml
@@ -44,7 +44,7 @@
                     }
                     <label for="upgradeRecordCost">@translator.Translate(userLanguage, "Cost")</label>
                     <input type="text" inputmode="decimal" onkeydown="interceptDecimalKeys(event)" onkeyup="fixDecimalInput(this, 2)" id="upgradeRecordCost" class="form-control" placeholder="@translator.Translate(userLanguage,"Cost of the upgrade/mods")" value="@(isNew ? "" : Model.Cost)">
-                    @await Html.PartialAsync("_SupplyStore", new SupplyStore { Tab = "UpgradeRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
+                    @await Html.PartialAsync("Supply/_SupplyStore", new SupplyStore { Tab = "UpgradeRecord", AdditionalSupplies = Model.RequisitionHistory.Any() })
                     <label for="upgradeRecordTag">@translator.Translate(userLanguage, "Tags(optional)")</label>
                     <select multiple class="form-select" id="upgradeRecordTag">
                         @foreach (string tag in Model.Tags)
@@ -105,7 +105,7 @@
         <button type="button" class="btn btn-primary" onclick="saveUpgradeRecordToVehicle(true)">@translator.Translate(userLanguage, "Edit Upgrade Record")</button>
     }
 </div>
-@await Html.PartialAsync("_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "upgradeRecordCost" })
+@await Html.PartialAsync("Supply/_SupplyRequisitionHistory", new SupplyRequisitionHistory { RequisitionHistory = Model.RequisitionHistory, CostInputId = "upgradeRecordCost" })
 <script>
     var selectedSupplies = [];
     var recurringReminderRecordId = [];
diff --git a/Views/Vehicle/_UpgradeRecords.cshtml b/Views/Vehicle/Upgrade/_UpgradeRecords.cshtml
similarity index 100%
rename from Views/Vehicle/_UpgradeRecords.cshtml
rename to Views/Vehicle/Upgrade/_UpgradeRecords.cshtml