diff --git a/src/components/admin/unit/damageReport/DamageReportListItem.vue b/src/components/admin/unit/damageReport/DamageReportListItem.vue
index 82fd74b..a838973 100644
--- a/src/components/admin/unit/damageReport/DamageReportListItem.vue
+++ b/src/components/admin/unit/damageReport/DamageReportListItem.vue
@@ -16,7 +16,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/equipmentType/CreateEquipmentTypeModal.vue b/src/components/admin/unit/equipmentType/CreateEquipmentTypeModal.vue
index bbe3a80..e0f50b5 100644
--- a/src/components/admin/unit/equipmentType/CreateEquipmentTypeModal.vue
+++ b/src/components/admin/unit/equipmentType/CreateEquipmentTypeModal.vue
@@ -40,7 +40,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipmentType";
-import type { CreateEquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { CreateEquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/equipmentType/DeleteEquipmentTypeModal.vue b/src/components/admin/unit/equipmentType/DeleteEquipmentTypeModal.vue
index 5324d74..355117d 100644
--- a/src/components/admin/unit/equipmentType/DeleteEquipmentTypeModal.vue
+++ b/src/components/admin/unit/equipmentType/DeleteEquipmentTypeModal.vue
@@ -39,7 +39,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipmentType";
-import type { CreateEquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { CreateEquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue b/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
index c8cb5ea..f3f50a1 100644
--- a/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
+++ b/src/components/admin/unit/equipmentType/EquipmentTypeListItem.vue
@@ -15,7 +15,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/inspection/OkNotOk.vue b/src/components/admin/unit/inspection/OkNotOk.vue
index 460c3df..861e6fa 100644
--- a/src/components/admin/unit/inspection/OkNotOk.vue
+++ b/src/components/admin/unit/inspection/OkNotOk.vue
@@ -25,7 +25,7 @@
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
 import { RadioGroup, RadioGroupOption } from "@headlessui/vue";
-import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/inspection/ResultInput.vue b/src/components/admin/unit/inspection/ResultInput.vue
index 2e68a1b..7ac023b 100644
--- a/src/components/admin/unit/inspection/ResultInput.vue
+++ b/src/components/admin/unit/inspection/ResultInput.vue
@@ -22,7 +22,7 @@
 
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
-import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPointViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/inspectionPlan/InspectionPlanListItem.vue b/src/components/admin/unit/inspectionPlan/InspectionPlanListItem.vue
index ab2a6fa..f80f564 100644
--- a/src/components/admin/unit/inspectionPlan/InspectionPlanListItem.vue
+++ b/src/components/admin/unit/inspectionPlan/InspectionPlanListItem.vue
@@ -16,7 +16,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue b/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue
index b8316d3..ac477cf 100644
--- a/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue
+++ b/src/components/admin/unit/inspectionPlan/TypeInspectionPlanListItem.vue
@@ -11,7 +11,7 @@
 
 <script setup lang="ts">
 import { defineComponent, type PropType } from "vue";
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/respiratoryGear/RespiratoryGearListItem.vue b/src/components/admin/unit/respiratoryGear/RespiratoryGearListItem.vue
index dd0a616..7b55acf 100644
--- a/src/components/admin/unit/respiratoryGear/RespiratoryGearListItem.vue
+++ b/src/components/admin/unit/respiratoryGear/RespiratoryGearListItem.vue
@@ -18,7 +18,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models";
+import type { RespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryGear.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/respiratoryMission/RespiratoryMissionListItem.vue b/src/components/admin/unit/respiratoryMission/RespiratoryMissionListItem.vue
index d51eaaa..913b132 100644
--- a/src/components/admin/unit/respiratoryMission/RespiratoryMissionListItem.vue
+++ b/src/components/admin/unit/respiratoryMission/RespiratoryMissionListItem.vue
@@ -16,7 +16,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models";
+import type { RespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryMission.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/respiratoryWearer/RespiratoryWearerListItem.vue b/src/components/admin/unit/respiratoryWearer/RespiratoryWearerListItem.vue
index f642990..291237e 100644
--- a/src/components/admin/unit/respiratoryWearer/RespiratoryWearerListItem.vue
+++ b/src/components/admin/unit/respiratoryWearer/RespiratoryWearerListItem.vue
@@ -19,7 +19,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models";
+import type { RespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryWearer.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/vehicleType/CreateVehicleTypeModal.vue b/src/components/admin/unit/vehicleType/CreateVehicleTypeModal.vue
index 79dfd38..b7a570e 100644
--- a/src/components/admin/unit/vehicleType/CreateVehicleTypeModal.vue
+++ b/src/components/admin/unit/vehicleType/CreateVehicleTypeModal.vue
@@ -40,7 +40,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useVehicleTypeStore } from "@/stores/admin/unit/vehicleType/vehicleType";
-import type { CreateVehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+import type { CreateVehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue b/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
index 4ade7a4..b18a059 100644
--- a/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
+++ b/src/components/admin/unit/vehicleType/VehicleTypeListItem.vue
@@ -15,7 +15,7 @@
 import { defineComponent, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
-import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/wearableType/CreateWearableTypeModal.vue b/src/components/admin/unit/wearableType/CreateWearableTypeModal.vue
index 8a97cfb..b7df9d0 100644
--- a/src/components/admin/unit/wearableType/CreateWearableTypeModal.vue
+++ b/src/components/admin/unit/wearableType/CreateWearableTypeModal.vue
@@ -40,7 +40,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
-import type { CreateWearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+import type { CreateWearableTypeViewModel } from "@/viewmodels/admin/unit/wearable/wearableType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/wearableType/DeleteWearableTypeModal.vue b/src/components/admin/unit/wearableType/DeleteWearableTypeModal.vue
index 1fc1576..d54d099 100644
--- a/src/components/admin/unit/wearableType/DeleteWearableTypeModal.vue
+++ b/src/components/admin/unit/wearableType/DeleteWearableTypeModal.vue
@@ -39,7 +39,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
-import type { CreateWearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+import type { CreateWearableTypeViewModel } from "@/viewmodels/admin/unit/wearable/wearableType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/admin/unit/wearableType/WearableTypeListItem.vue b/src/components/admin/unit/wearableType/WearableTypeListItem.vue
index 8f959ad..ce86f5b 100644
--- a/src/components/admin/unit/wearableType/WearableTypeListItem.vue
+++ b/src/components/admin/unit/wearableType/WearableTypeListItem.vue
@@ -9,10 +9,12 @@
 </template>
 
 <script setup lang="ts">
-import { defineComponent, type PropType } from "vue";
+import { defineAsyncComponent, defineComponent, markRaw, type PropType } from "vue";
 import { mapState, mapActions } from "pinia";
+import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
 import { useAbilityStore } from "@/stores/ability";
-import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearable/wearableType.models";
+import { useModalStore } from "@/stores/modal";
 </script>
 
 <script lang="ts">
diff --git a/src/components/search/EquipmentTypeSearchSelect.vue b/src/components/search/EquipmentTypeSearchSelect.vue
index 77fa8b6..809b444 100644
--- a/src/components/search/EquipmentTypeSearchSelect.vue
+++ b/src/components/search/EquipmentTypeSearchSelect.vue
@@ -86,7 +86,7 @@ import {
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import Spinner from "../Spinner.vue";
 import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipmentType";
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/search/InspectionPlanSearchSelect.vue b/src/components/search/InspectionPlanSearchSelect.vue
index 58a514b..4580bd5 100644
--- a/src/components/search/InspectionPlanSearchSelect.vue
+++ b/src/components/search/InspectionPlanSearchSelect.vue
@@ -86,7 +86,7 @@ import {
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import Spinner from "../Spinner.vue";
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/search/VehicleTypeSearchSelect.vue b/src/components/search/VehicleTypeSearchSelect.vue
index 09490cb..31d7752 100644
--- a/src/components/search/VehicleTypeSearchSelect.vue
+++ b/src/components/search/VehicleTypeSearchSelect.vue
@@ -86,7 +86,7 @@ import {
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import Spinner from "../Spinner.vue";
 import { useVehicleTypeStore } from "@/stores/admin/unit/vehicleType/vehicleType";
-import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/components/search/WearableTypeSearchSelect.vue b/src/components/search/WearableTypeSearchSelect.vue
index 33c42b4..5267904 100644
--- a/src/components/search/WearableTypeSearchSelect.vue
+++ b/src/components/search/WearableTypeSearchSelect.vue
@@ -86,7 +86,7 @@ import {
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import Spinner from "../Spinner.vue";
 import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableType";
-import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearable/wearableType.models";
 </script>
 
 <script lang="ts">
diff --git a/src/demodata/damageReport.ts b/src/demodata/damageReport.ts
deleted file mode 100644
index d65e381..0000000
--- a/src/demodata/damageReport.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
-import { equipmentDemoData } from "./equipment";
-
-export const damageReportDemoData: Array<DamageReportViewModel> = [
-  {
-    id: "sdfgh",
-    reported: new Date(),
-    status: "in Arbeit",
-    done: false,
-    description: "knjgljna g",
-    providedImage: [],
-    relatedId: "abc",
-    related: {
-      id: "abc",
-      code: "0456984224498",
-      name: "B-Schlauch",
-      location: "HLF",
-      commissioned: new Date(),
-      equipmentTypeId: "xyz",
-      equipmentType: {
-        id: "xyz",
-        type: "B-Schlauch",
-        description: "Shläuche vom Typ B",
-        inspectionPlans: [],
-      },
-      inspections: [],
-    },
-    assigned: "equipment",
-  },
-];
diff --git a/src/demodata/equipment.ts b/src/demodata/equipment.ts
deleted file mode 100644
index 06563b5..0000000
--- a/src/demodata/equipment.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { EquipmentViewModel } from "@/viewmodels/admin/unit/equipment/equipment.models";
-import { equipmentTypeDemoData } from "./equipmentType";
-import { inspectionDemoData } from "./inspectionPlan";
-
-export const equipmentDemoData: Array<EquipmentViewModel> = [
-  {
-    id: "abc",
-    code: "0456984224498",
-    name: "B-Schlauch",
-    location: "HLF",
-    commissioned: new Date(),
-    decommissioned: undefined,
-    equipmentTypeId: equipmentTypeDemoData[0].id,
-    equipmentType: equipmentTypeDemoData[0],
-    inspections: [inspectionDemoData[0]],
-  },
-];
diff --git a/src/demodata/equipmentType.ts b/src/demodata/equipmentType.ts
deleted file mode 100644
index df604cd..0000000
--- a/src/demodata/equipmentType.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
-import { inspectionPlanDemoData } from "./inspectionPlan";
-
-export const equipmentTypeDemoData: Array<EquipmentTypeViewModel> = [
-  {
-    id: "xyz",
-    type: "B-Schlauch",
-    description: "Shläuche vom Typ B",
-    inspectionPlans: [inspectionPlanDemoData[0], inspectionPlanDemoData[1]],
-  },
-];
diff --git a/src/demodata/inspectionPlan.ts b/src/demodata/inspectionPlan.ts
deleted file mode 100644
index 9482312..0000000
--- a/src/demodata/inspectionPlan.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import type {
-  InspectionPlanViewModel,
-  InspectionPointViewModel,
-} from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
-import type {
-  InspectionPointResultViewModel,
-  InspectionViewModel,
-} from "@/viewmodels/admin/unit/inspection/inspection.models";
-
-export const inspectionPointDemoData: Array<InspectionPointViewModel> = [
-  {
-    id: "edf",
-    title: "vorhandene Spritzstellen ausgebessert",
-    description: "",
-    type: "number",
-  },
-  {
-    id: "ghi",
-    title: "Einband der Kupplung sitzt fest",
-    description: "",
-    type: "iO-niO",
-  },
-  {
-    id: "lmn",
-    title: "Das überstehende Drahtende des Knaggenteiles sitzt versenkt",
-    description: "",
-    type: "iO-niO",
-  },
-  {
-    id: "jgj",
-    title: "Gebrauchsprüfdruck 12bar",
-    description: "",
-    type: "iO-niO",
-  },
-];
-
-export const inspectionPlanDemoData: Array<InspectionPlanViewModel> = [
-  {
-    id: "abc",
-    title: "Sichtprüfung",
-    version: 1,
-    inspectionInterval: "1-m",
-    remindTime: "1-m",
-    created: new Date(),
-    inspectionPoints: [inspectionPointDemoData[0], inspectionPointDemoData[1], inspectionPointDemoData[2]],
-    relatedId: "xyz",
-    related: {
-      id: "xyz",
-      type: "B-Schlauch",
-      description: "Shläuche vom Typ B",
-      inspectionPlans: [],
-    },
-    assigned: "equipment",
-  },
-  {
-    id: "cba",
-    title: "Druckprüfung",
-    version: 1,
-    inspectionInterval: "1-m",
-    remindTime: "22/10",
-    created: new Date(),
-    inspectionPoints: [inspectionPointDemoData[3]],
-    relatedId: "xyz",
-    related: {
-      id: "xyz",
-      type: "B-Schlauch",
-      description: "Shläuche vom Typ B",
-      inspectionPlans: [],
-    },
-    assigned: "equipment",
-  },
-];
-
-export const inspectionPointResultDemoData: Array<InspectionPointResultViewModel> = [
-  {
-    inspectionId: "jkvshdfg",
-    inspectionVersionedPlanId: inspectionPlanDemoData[0].id,
-    inspectionPointId: inspectionPointDemoData[0].id,
-    value: "5",
-  },
-  {
-    inspectionId: "jkvshdfg",
-    inspectionVersionedPlanId: inspectionPlanDemoData[0].id,
-    inspectionPointId: inspectionPointDemoData[1].id,
-    value: "",
-  },
-  {
-    inspectionId: "jkvshdfg",
-    inspectionVersionedPlanId: inspectionPlanDemoData[0].id,
-    inspectionPointId: inspectionPointDemoData[1].id,
-    value: "",
-  },
-];
-
-export const inspectionDemoData: Array<InspectionViewModel> = [
-  {
-    id: "jkvshdfg",
-    inspectionPlanId: inspectionPlanDemoData[0].id,
-    inspectionPlan: inspectionPlanDemoData[0],
-    inspectionVersionedPlanId: inspectionPlanDemoData[0].id,
-    inspectionVersionedPlan: inspectionPlanDemoData[0],
-    context: "",
-    created: new Date(),
-    finished: undefined,
-    nextInspection: undefined,
-    isOpen: true,
-    checks: [inspectionPointResultDemoData[0], inspectionPointResultDemoData[1], inspectionPointResultDemoData[2]],
-    relatedId: "abc",
-    related: {
-      id: "abc",
-      code: "0456984224498",
-      name: "B-Schlauch",
-      location: "HLF",
-      commissioned: new Date(),
-      equipmentTypeId: "xyz",
-      equipmentType: {
-        id: "xyz",
-        type: "B-Schlauch",
-        description: "Shläuche vom Typ B",
-        inspectionPlans: [],
-      },
-      inspections: [],
-    },
-    assigned: "equipment",
-  },
-  {
-    id: "jkvshdfg",
-    inspectionPlanId: inspectionPlanDemoData[0].id,
-    inspectionPlan: inspectionPlanDemoData[0],
-    inspectionVersionedPlanId: inspectionPlanDemoData[0].id,
-    inspectionVersionedPlan: inspectionPlanDemoData[0],
-    context: "sohgfpb",
-    created: new Date(),
-    finished: new Date(),
-    nextInspection: new Date(),
-    isOpen: false,
-    checks: [inspectionPointResultDemoData[0], inspectionPointResultDemoData[1], inspectionPointResultDemoData[2]],
-    relatedId: "abc",
-    related: {
-      id: "abc",
-      code: "0456984224498",
-      name: "B-Schlauch",
-      location: "HLF",
-      commissioned: new Date(),
-      equipmentTypeId: "xyz",
-      equipmentType: {
-        id: "xyz",
-        type: "B-Schlauch",
-        description: "Shläuche vom Typ B",
-        inspectionPlans: [],
-      },
-      inspections: [],
-    },
-    assigned: "equipment",
-  },
-];
diff --git a/src/demodata/respiratoryGear.ts b/src/demodata/respiratoryGear.ts
deleted file mode 100644
index caf4de0..0000000
--- a/src/demodata/respiratoryGear.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { RespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models";
-import { equipmentDemoData } from "./equipment";
-
-export const respiratoryGearDemoData: Array<RespiratoryGearViewModel> = [
-  {
-    id: "adfsg",
-    equipmentId: equipmentDemoData[0].id,
-    equipment: equipmentDemoData[0],
-  },
-];
diff --git a/src/demodata/respiratoryMission.ts b/src/demodata/respiratoryMission.ts
deleted file mode 100644
index e32c39e..0000000
--- a/src/demodata/respiratoryMission.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { RespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models";
-import { equipmentDemoData } from "./equipment";
-
-export const respiratoryMissionDemoData: Array<RespiratoryMissionViewModel> = [
-  {
-    id: "adfsg",
-    date: new Date(),
-    title: "B5",
-    description: "B5 Einsatz",
-  },
-];
diff --git a/src/demodata/respiratoryWearer.ts b/src/demodata/respiratoryWearer.ts
deleted file mode 100644
index 01019a0..0000000
--- a/src/demodata/respiratoryWearer.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { RespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models";
-
-export const respiratoryWearerDemoData: Array<RespiratoryWearerViewModel> = [
-  {
-    id: "dfghj",
-    memberId: "9469991d-fa22-4899-82ce-b1ba5de990dc",
-    member: {
-      id: "9469991d-fa22-4899-82ce-b1ba5de990dc",
-      salutation: { id: 3, salutation: "Herr" },
-      firstname: "Julian",
-      lastname: "Krauser",
-      nameaffix: "",
-      birthdate: new Date("2003-09-20"),
-      internalId: "1312",
-    },
-  },
-];
diff --git a/src/demodata/vehicle.ts b/src/demodata/vehicle.ts
deleted file mode 100644
index b307abb..0000000
--- a/src/demodata/vehicle.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { VehicleViewModel } from "@/viewmodels/admin/unit/vehicle/vehicle.models";
-import { vehicleTypeDemoData } from "./vehicleType";
-
-export const vehicleDemoData: Array<VehicleViewModel> = [
-  {
-    id: "kjhb",
-    code: "",
-    name: "HLF",
-    location: "Tor 1",
-    commissioned: new Date(),
-    decommissioned: undefined,
-    vehicleTypeId: vehicleTypeDemoData[0].id,
-    vehicleType: vehicleTypeDemoData[0],
-    inspections: [],
-  },
-  {
-    id: "kjhdfgb",
-    code: "",
-    name: "LF",
-    location: "Tor 2",
-    commissioned: new Date(),
-    decommissioned: undefined,
-    vehicleTypeId: vehicleTypeDemoData[1].id,
-    vehicleType: vehicleTypeDemoData[1],
-    inspections: [],
-  },
-];
diff --git a/src/demodata/vehicleType.ts b/src/demodata/vehicleType.ts
deleted file mode 100644
index bf25718..0000000
--- a/src/demodata/vehicleType.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
-
-export const vehicleTypeDemoData: Array<VehicleTypeViewModel> = [
-  {
-    id: "xyfgdghfz",
-    type: "HLF 20/10",
-    description: "HLF",
-    inspectionPlans: [],
-  },
-  {
-    id: "abc",
-    type: "LF 8/6",
-    description: "LF",
-    inspectionPlans: [],
-  },
-];
diff --git a/src/demodata/wearable.ts b/src/demodata/wearable.ts
deleted file mode 100644
index 973de4a..0000000
--- a/src/demodata/wearable.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { WearableViewModel } from "@/viewmodels/admin/unit/wearable/wearable.models";
-import { wearableTypeDemoData } from "./wearableType";
-
-export const wearableDemoData: Array<WearableViewModel> = [
-  {
-    id: "absdfgc",
-    code: "0456984224498",
-    name: "Jacke",
-    location: "Spint",
-    commissioned: new Date(),
-    decommissioned: undefined,
-    wearerId: "9469991d-fa22-4899-82ce-b1ba5de990dc",
-    wearer: {
-      id: "9469991d-fa22-4899-82ce-b1ba5de990dc",
-      salutation: { id: 3, salutation: "Herr" },
-      firstname: "Julian",
-      lastname: "Krauser",
-      nameaffix: "",
-      birthdate: new Date("2003-09-20"),
-      internalId: "1312",
-    },
-    wearableTypeId: wearableTypeDemoData[0].id,
-    wearableType: wearableTypeDemoData[0],
-  },
-];
diff --git a/src/demodata/wearableType.ts b/src/demodata/wearableType.ts
deleted file mode 100644
index b5aef7f..0000000
--- a/src/demodata/wearableType.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
-
-export const wearableTypeDemoData: Array<WearableTypeViewModel> = [
-  {
-    id: "xyz",
-    type: "Jacke",
-    description: "Bayern 2000",
-  },
-];
diff --git a/src/stores/admin/unit/damageReport/damageReport.ts b/src/stores/admin/unit/damageReport/damageReport.ts
index 04c6b7c..aeb998e 100644
--- a/src/stores/admin/unit/damageReport/damageReport.ts
+++ b/src/stores/admin/unit/damageReport/damageReport.ts
@@ -3,11 +3,9 @@ import type {
   DamageReportViewModel,
   CreateDamageReportViewModel,
   UpdateDamageReportViewModel,
-} from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+} from "@/viewmodels/admin/unit/damageReport.models";
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
-import type { VehicleViewModel } from "@/viewmodels/admin/unit/vehicle/vehicle.models";
-import { damageReportDemoData } from "@/demodata/damageReport";
 
 export const useDamageReportStore = defineStore("damageReport", {
   state: () => {
diff --git a/src/stores/admin/unit/equipment/damageReport.ts b/src/stores/admin/unit/equipment/damageReport.ts
index 5b757d3..afda1e8 100644
--- a/src/stores/admin/unit/equipment/damageReport.ts
+++ b/src/stores/admin/unit/equipment/damageReport.ts
@@ -1,8 +1,7 @@
 import { defineStore } from "pinia";
 import { http } from "@/serverCom";
 import { useEquipmentStore } from "./equipment";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
-import { damageReportDemoData } from "@/demodata/damageReport";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 
 export const useEquipmentDamageReportStore = defineStore("equipmentDamageReport", {
   state: () => {
diff --git a/src/views/admin/unit/damageReport/DamageReport.vue b/src/views/admin/unit/damageReport/DamageReport.vue
index 78133df..cc4dd22 100644
--- a/src/views/admin/unit/damageReport/DamageReport.vue
+++ b/src/views/admin/unit/damageReport/DamageReport.vue
@@ -20,7 +20,7 @@ import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useAbilityStore } from "@/stores/ability";
 import { useDamageReportStore } from "@/stores/admin/unit/damageReport/damageReport";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 import Pagination from "@/components/Pagination.vue";
 import DamageReportListItem from "@/components/admin/unit/damageReport/DamageReportListItem.vue";
 </script>
diff --git a/src/views/admin/unit/equipment/DamageReport.vue b/src/views/admin/unit/equipment/DamageReport.vue
index 3a1f043..fbe0f8d 100644
--- a/src/views/admin/unit/equipment/DamageReport.vue
+++ b/src/views/admin/unit/equipment/DamageReport.vue
@@ -29,7 +29,7 @@ import { mapActions, mapState } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
 import { useEquipmentDamageReportStore } from "@/stores/admin/unit/equipment/damageReport";
 import Pagination from "@/components/Pagination.vue";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 import { PhotoIcon, PencilSquareIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/views/admin/unit/equipmentType/EquipmentType.vue b/src/views/admin/unit/equipmentType/EquipmentType.vue
index 8403461..f7f3d6b 100644
--- a/src/views/admin/unit/equipmentType/EquipmentType.vue
+++ b/src/views/admin/unit/equipmentType/EquipmentType.vue
@@ -33,7 +33,7 @@ import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipme
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 import EquipmentTypeListItem from "@/components/admin/unit/equipmentType/EquipmentTypeListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue b/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue
index eb372e7..5d1af44 100644
--- a/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue
+++ b/src/views/admin/unit/equipmentType/UpdateEquipmentType.vue
@@ -37,7 +37,7 @@ import type {
   CreateEquipmentTypeViewModel,
   EquipmentTypeViewModel,
   UpdateEquipmentTypeViewModel,
-} from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+} from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/inspection/InspectionExecute.vue b/src/views/admin/unit/inspection/InspectionExecute.vue
index 1c8bc08..322091f 100644
--- a/src/views/admin/unit/inspection/InspectionExecute.vue
+++ b/src/views/admin/unit/inspection/InspectionExecute.vue
@@ -56,6 +56,7 @@ import ResultInput from "@/components/admin/unit/inspection/ResultInput.vue";
 import type { InspectionPointResultViewModel } from "@/viewmodels/admin/unit/inspection/inspection.models";
 import cloneDeep from "lodash.clonedeep";
 import isEqual from "lodash.isequal";
+import { InspectionPointEnum } from "@/enums/inspectionEnum";
 </script>
 
 <script lang="ts">
diff --git a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
index c1a3c4a..4b4f9e3 100644
--- a/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/CreateInspectionPlan.vue
@@ -94,9 +94,9 @@ import {
 } from "@headlessui/vue";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
-import type { CreateInspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { CreateInspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 import ScanInput from "@/components/ScanInput.vue";
-import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipmentType/equipmentType.models";
+import type { EquipmentTypeViewModel } from "@/viewmodels/admin/unit/equipment/equipmentType.models";
 import { useEquipmentTypeStore } from "@/stores/admin/unit/equipmentType/equipmentType";
 import EquipmentTypeSearchSelect from "@/components/search/EquipmentTypeSearchSelect.vue";
 import VehicleTypeSearchSelect from "@/components/search/VehicleTypeSearchSelect.vue";
diff --git a/src/views/admin/unit/inspectionPlan/InspectionPlan.vue b/src/views/admin/unit/inspectionPlan/InspectionPlan.vue
index fdee7b4..07ba271 100644
--- a/src/views/admin/unit/inspectionPlan/InspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/InspectionPlan.vue
@@ -39,7 +39,7 @@ import MainTemplate from "@/templates/Main.vue";
 import { useInspectionPlanStore } from "@/stores/admin/unit/inspectionPlan/inspectionPlan";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+import type { InspectionPlanViewModel } from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 import InspectionPlanListItem from "@/components/admin/unit/inspectionPlan/InspectionPlanListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
index eaad622..4525b7c 100644
--- a/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
+++ b/src/views/admin/unit/inspectionPlan/UpdateInspectionPlan.vue
@@ -37,7 +37,7 @@ import type {
   CreateInspectionPlanViewModel,
   InspectionPlanViewModel,
   UpdateInspectionPlanViewModel,
-} from "@/viewmodels/admin/unit/inspectionPlan/inspectionPlan.models";
+} from "@/viewmodels/admin/unit/inspection/inspectionPlan.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/respiratoryGear/CreateRespiratoryGear.vue b/src/views/admin/unit/respiratoryGear/CreateRespiratoryGear.vue
index 3d84221..71f98f0 100644
--- a/src/views/admin/unit/respiratoryGear/CreateRespiratoryGear.vue
+++ b/src/views/admin/unit/respiratoryGear/CreateRespiratoryGear.vue
@@ -30,7 +30,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useRespiratoryGearStore } from "@/stores/admin/unit/respiratoryGear/respiratoryGear";
-import type { CreateRespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models";
+import type { CreateRespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryGear.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/respiratoryGear/RespiratoryGear.vue b/src/views/admin/unit/respiratoryGear/RespiratoryGear.vue
index c4f3a2c..211bd36 100644
--- a/src/views/admin/unit/respiratoryGear/RespiratoryGear.vue
+++ b/src/views/admin/unit/respiratoryGear/RespiratoryGear.vue
@@ -39,7 +39,7 @@ import { useRespiratoryGearStore } from "@/stores/admin/unit/respiratoryGear/res
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratoryGear/respiratoryGear.models";
+import type { RespiratoryGearViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryGear.models";
 import RespiratoryGearListItem from "@/components/admin/unit/respiratoryGear/RespiratoryGearListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/respiratoryMission/CreateRespiratoryMission.vue b/src/views/admin/unit/respiratoryMission/CreateRespiratoryMission.vue
index 6a422fd..3687b54 100644
--- a/src/views/admin/unit/respiratoryMission/CreateRespiratoryMission.vue
+++ b/src/views/admin/unit/respiratoryMission/CreateRespiratoryMission.vue
@@ -41,7 +41,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useRespiratoryMissionStore } from "@/stores/admin/unit/respiratoryMission/respiratoryMission";
-import type { CreateRespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models";
+import type { CreateRespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryMission.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/respiratoryMission/RespiratoryMission.vue b/src/views/admin/unit/respiratoryMission/RespiratoryMission.vue
index d7ecb22..c3f4834 100644
--- a/src/views/admin/unit/respiratoryMission/RespiratoryMission.vue
+++ b/src/views/admin/unit/respiratoryMission/RespiratoryMission.vue
@@ -39,7 +39,7 @@ import { useRespiratoryMissionStore } from "@/stores/admin/unit/respiratoryMissi
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratoryMission/respiratoryMission.models";
+import type { RespiratoryMissionViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryMission.models";
 import RespiratoryMissionListItem from "@/components/admin/unit/respiratoryMission/RespiratoryMissionListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/respiratoryWearer/CreateRespiratoryWearer.vue b/src/views/admin/unit/respiratoryWearer/CreateRespiratoryWearer.vue
index 4c20abf..7334432 100644
--- a/src/views/admin/unit/respiratoryWearer/CreateRespiratoryWearer.vue
+++ b/src/views/admin/unit/respiratoryWearer/CreateRespiratoryWearer.vue
@@ -30,7 +30,7 @@ import { defineComponent } from "vue";
 import { mapActions, mapState } from "pinia";
 import MainTemplate from "@/templates/Main.vue";
 import { useRespiratoryWearerStore } from "@/stores/admin/unit/respiratoryWearer/respiratoryWearer";
-import type { CreateRespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models";
+import type { CreateRespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryWearer.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/respiratoryWearer/RespiratoryWearer.vue b/src/views/admin/unit/respiratoryWearer/RespiratoryWearer.vue
index 07c1ba0..58f664a 100644
--- a/src/views/admin/unit/respiratoryWearer/RespiratoryWearer.vue
+++ b/src/views/admin/unit/respiratoryWearer/RespiratoryWearer.vue
@@ -39,7 +39,7 @@ import { useRespiratoryWearerStore } from "@/stores/admin/unit/respiratoryWearer
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { RespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratoryWearer/respiratoryWearer.models";
+import type { RespiratoryWearerViewModel } from "@/viewmodels/admin/unit/respiratory/respiratoryWearer.models";
 import RespiratoryWearerListItem from "@/components/admin/unit/respiratoryWearer/RespiratoryWearerListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/vehicle/DamageReport.vue b/src/views/admin/unit/vehicle/DamageReport.vue
index dd05bf6..04097f8 100644
--- a/src/views/admin/unit/vehicle/DamageReport.vue
+++ b/src/views/admin/unit/vehicle/DamageReport.vue
@@ -29,7 +29,7 @@ import { mapActions, mapState } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
 import { useVehicleDamageReportStore } from "@/stores/admin/unit/vehicle/damageReport";
 import Pagination from "@/components/Pagination.vue";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 import { PhotoIcon, PencilSquareIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/views/admin/unit/vehicleType/UpdateVehicleType.vue b/src/views/admin/unit/vehicleType/UpdateVehicleType.vue
index 2262d00..57e1db1 100644
--- a/src/views/admin/unit/vehicleType/UpdateVehicleType.vue
+++ b/src/views/admin/unit/vehicleType/UpdateVehicleType.vue
@@ -37,7 +37,7 @@ import type {
   CreateVehicleTypeViewModel,
   VehicleTypeViewModel,
   UpdateVehicleTypeViewModel,
-} from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+} from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/vehicleType/VehicleType.vue b/src/views/admin/unit/vehicleType/VehicleType.vue
index a74082e..5dcb552 100644
--- a/src/views/admin/unit/vehicleType/VehicleType.vue
+++ b/src/views/admin/unit/vehicleType/VehicleType.vue
@@ -33,7 +33,7 @@ import { useVehicleTypeStore } from "@/stores/admin/unit/vehicleType/vehicleType
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicleType/vehicleType.models";
+import type { VehicleTypeViewModel } from "@/viewmodels/admin/unit/vehicle/vehicleType.models";
 import VehicleTypeListItem from "@/components/admin/unit/vehicleType/VehicleTypeListItem.vue";
 </script>
 
diff --git a/src/views/admin/unit/wearable/DamageReport.vue b/src/views/admin/unit/wearable/DamageReport.vue
index 78f1b3e..555a273 100644
--- a/src/views/admin/unit/wearable/DamageReport.vue
+++ b/src/views/admin/unit/wearable/DamageReport.vue
@@ -29,7 +29,7 @@ import { mapActions, mapState } from "pinia";
 import { useAbilityStore } from "@/stores/ability";
 import { useWearableDamageReportStore } from "@/stores/admin/unit/wearable/damageReport";
 import Pagination from "@/components/Pagination.vue";
-import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport/damageReport.models";
+import type { DamageReportViewModel } from "@/viewmodels/admin/unit/damageReport.models";
 import { PhotoIcon, PencilSquareIcon } from "@heroicons/vue/24/outline";
 </script>
 
diff --git a/src/views/admin/unit/wearableType/UpdateWearableType.vue b/src/views/admin/unit/wearableType/UpdateWearableType.vue
index 62cd35a..4bc7344 100644
--- a/src/views/admin/unit/wearableType/UpdateWearableType.vue
+++ b/src/views/admin/unit/wearableType/UpdateWearableType.vue
@@ -37,7 +37,7 @@ import type {
   CreateWearableTypeViewModel,
   WearableTypeViewModel,
   UpdateWearableTypeViewModel,
-} from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+} from "@/viewmodels/admin/unit/wearable/wearableType.models";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
diff --git a/src/views/admin/unit/wearableType/WearableType.vue b/src/views/admin/unit/wearableType/WearableType.vue
index 33c18f0..0c1c45c 100644
--- a/src/views/admin/unit/wearableType/WearableType.vue
+++ b/src/views/admin/unit/wearableType/WearableType.vue
@@ -33,7 +33,7 @@ import { useWearableTypeStore } from "@/stores/admin/unit/wearableType/wearableT
 import { useModalStore } from "@/stores/modal";
 import Pagination from "@/components/Pagination.vue";
 import { useAbilityStore } from "@/stores/ability";
-import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearableType/wearableType.models";
+import type { WearableTypeViewModel } from "@/viewmodels/admin/unit/wearable/wearableType.models";
 import WearableTypeListItem from "@/components/admin/unit/wearableType/WearableTypeListItem.vue";
 </script>