diff --git a/app/components/admin/visibility-controls.js b/app/components/admin/visibility-controls.js
index 2f56e039..712e5d75 100644
--- a/app/components/admin/visibility-controls.js
+++ b/app/components/admin/visibility-controls.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/admin/visibility-controls';
+export { default } from '@fleetbase/fleetops-engine/components/admin/visibility-controls';
diff --git a/app/components/cell/driver-name.js b/app/components/cell/driver-name.js
index 9909dd6c..dc7ad290 100644
--- a/app/components/cell/driver-name.js
+++ b/app/components/cell/driver-name.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/cell/driver-name';
+export { default } from '@fleetbase/fleetops-engine/components/cell/driver-name';
diff --git a/app/components/custom-field-value.js b/app/components/custom-field-value.js
index 23a0a373..a6ab3115 100644
--- a/app/components/custom-field-value.js
+++ b/app/components/custom-field-value.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/custom-field-value';
+export { default } from '@fleetbase/fleetops-engine/components/custom-field-value';
diff --git a/app/components/custom-field.js b/app/components/custom-field.js
index 3971c7f1..9dbc0719 100644
--- a/app/components/custom-field.js
+++ b/app/components/custom-field.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/custom-field';
+export { default } from '@fleetbase/fleetops-engine/components/custom-field';
diff --git a/app/components/display-place.js b/app/components/display-place.js
index dc4f61c5..c401e92e 100644
--- a/app/components/display-place.js
+++ b/app/components/display-place.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/display-place';
+export { default } from '@fleetbase/fleetops-engine/components/display-place';
diff --git a/app/components/driver-card-mini.js b/app/components/driver-card-mini.js
index b7feb8c5..720444a0 100644
--- a/app/components/driver-card-mini.js
+++ b/app/components/driver-card-mini.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/driver-card-mini';
+export { default } from '@fleetbase/fleetops-engine/components/driver-card-mini';
diff --git a/app/components/driver-card.js b/app/components/driver-card.js
index edbc2972..6f6f4c9e 100644
--- a/app/components/driver-card.js
+++ b/app/components/driver-card.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/driver-card';
+export { default } from '@fleetbase/fleetops-engine/components/driver-card';
diff --git a/app/components/driver-form-panel.js b/app/components/driver-form-panel.js
index 68aa7a43..17ef7295 100644
--- a/app/components/driver-form-panel.js
+++ b/app/components/driver-form-panel.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/driver-form-panel';
+export { default } from '@fleetbase/fleetops-engine/components/driver-form-panel';
diff --git a/app/components/driver-panel.js b/app/components/driver-panel.js
index 1d68f84b..033d6791 100644
--- a/app/components/driver-panel.js
+++ b/app/components/driver-panel.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/driver-panel';
+export { default } from '@fleetbase/fleetops-engine/components/driver-panel';
diff --git a/app/components/driver-panel/details.js b/app/components/driver-panel/details.js
index 38698406..67e5f64e 100644
--- a/app/components/driver-panel/details.js
+++ b/app/components/driver-panel/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/driver-panel/details';
+export { default } from '@fleetbase/fleetops-engine/components/driver-panel/details';
diff --git a/app/components/event-timeline/event.js b/app/components/event-timeline/event.js
index bb8eda53..e6082e5d 100644
--- a/app/components/event-timeline/event.js
+++ b/app/components/event-timeline/event.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/event-timeline/event';
+export { default } from '@fleetbase/fleetops-engine/components/event-timeline/event';
diff --git a/app/components/file-icon.js b/app/components/file-icon.js
index 787cf6f7..1cc8568b 100644
--- a/app/components/file-icon.js
+++ b/app/components/file-icon.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/file-icon';
+export { default } from '@fleetbase/fleetops-engine/components/file-icon';
diff --git a/app/components/fleet-driver-listing.js b/app/components/fleet-driver-listing.js
index 27a278db..42f80d8a 100644
--- a/app/components/fleet-driver-listing.js
+++ b/app/components/fleet-driver-listing.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/fleet-driver-listing';
+export { default } from '@fleetbase/fleetops-engine/components/fleet-driver-listing';
diff --git a/app/components/fleet-form-panel.js b/app/components/fleet-form-panel.js
index b7879de0..802d0d9f 100644
--- a/app/components/fleet-form-panel.js
+++ b/app/components/fleet-form-panel.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/fleet-form-panel';
+export { default } from '@fleetbase/fleetops-engine/components/fleet-form-panel';
diff --git a/app/components/fleet-panel.js b/app/components/fleet-panel.js
index 05e6b658..1f6e16de 100644
--- a/app/components/fleet-panel.js
+++ b/app/components/fleet-panel.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/fleet-panel';
+export { default } from '@fleetbase/fleetops-engine/components/fleet-panel';
diff --git a/app/components/fleet-vehicle-listing.js b/app/components/fleet-vehicle-listing.js
index c930512b..7ac682a4 100644
--- a/app/components/fleet-vehicle-listing.js
+++ b/app/components/fleet-vehicle-listing.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/fleet-vehicle-listing';
+export { default } from '@fleetbase/fleetops-engine/components/fleet-vehicle-listing';
diff --git a/app/components/full-calendar.js b/app/components/full-calendar.js
index 49bdb1e8..3876a6ce 100644
--- a/app/components/full-calendar.js
+++ b/app/components/full-calendar.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/full-calendar';
+export { default } from '@fleetbase/fleetops-engine/components/full-calendar';
diff --git a/app/components/full-calendar/draggable.js b/app/components/full-calendar/draggable.js
index d824f954..c1226b88 100644
--- a/app/components/full-calendar/draggable.js
+++ b/app/components/full-calendar/draggable.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/full-calendar/draggable';
+export { default } from '@fleetbase/fleetops-engine/components/full-calendar/draggable';
diff --git a/app/components/full-size.js b/app/components/full-size.js
index 99ffb77a..ea7bdd2a 100644
--- a/app/components/full-size.js
+++ b/app/components/full-size.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/full-size';
+export { default } from '@fleetbase/fleetops-engine/components/full-size';
diff --git a/app/components/global-search.js b/app/components/global-search.js
index ee34a3d3..dbe48865 100644
--- a/app/components/global-search.js
+++ b/app/components/global-search.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/global-search';
+export { default } from '@fleetbase/fleetops-engine/components/global-search';
diff --git a/app/components/horizontal-route.js b/app/components/horizontal-route.js
index c45a6ba0..ed0f04cd 100644
--- a/app/components/horizontal-route.js
+++ b/app/components/horizontal-route.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/horizontal-route';
+export { default } from '@fleetbase/fleetops-engine/components/horizontal-route';
diff --git a/app/components/integrated-order-details.js b/app/components/integrated-order-details.js
index 67b2673d..ecf2bdcd 100644
--- a/app/components/integrated-order-details.js
+++ b/app/components/integrated-order-details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/integrated-order-details';
+export { default } from '@fleetbase/fleetops-engine/components/integrated-order-details';
diff --git a/app/components/layout/fleet-ops-sidebar.js b/app/components/layout/fleet-ops-sidebar.js
index 5d04ee63..e86182e8 100644
--- a/app/components/layout/fleet-ops-sidebar.js
+++ b/app/components/layout/fleet-ops-sidebar.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/layout/fleet-ops-sidebar';
+export { default } from '@fleetbase/fleetops-engine/components/layout/fleet-ops-sidebar';
diff --git a/app/components/leaflet-draw-control.js b/app/components/leaflet-draw-control.js
index cb4b9d67..23ff36cd 100644
--- a/app/components/leaflet-draw-control.js
+++ b/app/components/leaflet-draw-control.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/leaflet-draw-control';
+export { default } from '@fleetbase/fleetops-engine/components/leaflet-draw-control';
diff --git a/app/components/leaflet-drift-marker.js b/app/components/leaflet-drift-marker.js
index 43e23e04..e26c1049 100644
--- a/app/components/leaflet-drift-marker.js
+++ b/app/components/leaflet-drift-marker.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/leaflet-drift-marker';
+export { default } from '@fleetbase/fleetops-engine/components/leaflet-drift-marker';
diff --git a/app/components/leaflet-rotated-marker.js b/app/components/leaflet-rotated-marker.js
index f5abc4cd..c907ce9b 100644
--- a/app/components/leaflet-rotated-marker.js
+++ b/app/components/leaflet-rotated-marker.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/leaflet-rotated-marker';
+export { default } from '@fleetbase/fleetops-engine/components/leaflet-rotated-marker';
diff --git a/app/components/live-map.js b/app/components/live-map.js
index 2b5288c4..fc6cabad 100644
--- a/app/components/live-map.js
+++ b/app/components/live-map.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/live-map';
+export { default } from '@fleetbase/fleetops-engine/components/live-map';
diff --git a/app/components/map-container.js b/app/components/map-container.js
index 85dbd5d0..a016e4ca 100644
--- a/app/components/map-container.js
+++ b/app/components/map-container.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/map-container';
+export { default } from '@fleetbase/fleetops-engine/components/map-container';
diff --git a/app/components/map-container/toolbar-container.js b/app/components/map-container/toolbar-container.js
index 5b1292e6..75d35ecb 100644
--- a/app/components/map-container/toolbar-container.js
+++ b/app/components/map-container/toolbar-container.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/map-container/toolbar-container';
+export { default } from '@fleetbase/fleetops-engine/components/map-container/toolbar-container';
diff --git a/app/components/map-container/toolbar.js b/app/components/map-container/toolbar.js
index 2443a8bb..9de8499f 100644
--- a/app/components/map-container/toolbar.js
+++ b/app/components/map-container/toolbar.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/map-container/toolbar';
+export { default } from '@fleetbase/fleetops-engine/components/map-container/toolbar';
diff --git a/app/components/map-container/toolbar/zones-panel.js b/app/components/map-container/toolbar/zones-panel.js
index 527b5c6a..5b863a32 100644
--- a/app/components/map-container/toolbar/zones-panel.js
+++ b/app/components/map-container/toolbar/zones-panel.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/map-container/toolbar/zones-panel';
+export { default } from '@fleetbase/fleetops-engine/components/map-container/toolbar/zones-panel';
diff --git a/app/components/map-container/topbar.js b/app/components/map-container/topbar.js
index 9e194bef..868f7259 100644
--- a/app/components/map-container/topbar.js
+++ b/app/components/map-container/topbar.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/map-container/topbar';
+export { default } from '@fleetbase/fleetops-engine/components/map-container/topbar';
diff --git a/app/components/map-container/view-switch.js b/app/components/map-container/view-switch.js
index 59b2106c..269810a6 100644
--- a/app/components/map-container/view-switch.js
+++ b/app/components/map-container/view-switch.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/map-container/view-switch';
+export { default } from '@fleetbase/fleetops-engine/components/map-container/view-switch';
diff --git a/app/components/modals/assign-driver.js b/app/components/modals/assign-driver.js
index b638bc0d..310a8054 100644
--- a/app/components/modals/assign-driver.js
+++ b/app/components/modals/assign-driver.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/assign-driver';
+export { default } from '@fleetbase/fleetops-engine/components/modals/assign-driver';
diff --git a/app/components/modals/clone-config-form.js b/app/components/modals/clone-config-form.js
index 42d5e245..c01b0b63 100644
--- a/app/components/modals/clone-config-form.js
+++ b/app/components/modals/clone-config-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/clone-config-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/clone-config-form';
diff --git a/app/components/modals/contact-details.js b/app/components/modals/contact-details.js
index 18af18e6..0af8fb2f 100644
--- a/app/components/modals/contact-details.js
+++ b/app/components/modals/contact-details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/contact-details';
+export { default } from '@fleetbase/fleetops-engine/components/modals/contact-details';
diff --git a/app/components/modals/contact-form.js b/app/components/modals/contact-form.js
index 59846d72..ee2f1b33 100644
--- a/app/components/modals/contact-form.js
+++ b/app/components/modals/contact-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/contact-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/contact-form';
diff --git a/app/components/modals/driver-assign-order.js b/app/components/modals/driver-assign-order.js
index dc913979..5dc80d9f 100644
--- a/app/components/modals/driver-assign-order.js
+++ b/app/components/modals/driver-assign-order.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/driver-assign-order';
+export { default } from '@fleetbase/fleetops-engine/components/modals/driver-assign-order';
diff --git a/app/components/modals/driver-assign-vehicle.js b/app/components/modals/driver-assign-vehicle.js
index 88316b41..ecbcb384 100644
--- a/app/components/modals/driver-assign-vehicle.js
+++ b/app/components/modals/driver-assign-vehicle.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/driver-assign-vehicle';
+export { default } from '@fleetbase/fleetops-engine/components/modals/driver-assign-vehicle';
diff --git a/app/components/modals/driver-assign-vendor.js b/app/components/modals/driver-assign-vendor.js
index 11626c86..ec697117 100644
--- a/app/components/modals/driver-assign-vendor.js
+++ b/app/components/modals/driver-assign-vendor.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/driver-assign-vendor';
+export { default } from '@fleetbase/fleetops-engine/components/modals/driver-assign-vendor';
diff --git a/app/components/modals/driver-details.js b/app/components/modals/driver-details.js
index 9612b005..a53559f4 100644
--- a/app/components/modals/driver-details.js
+++ b/app/components/modals/driver-details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/driver-details';
+export { default } from '@fleetbase/fleetops-engine/components/modals/driver-details';
diff --git a/app/components/modals/driver-form.js b/app/components/modals/driver-form.js
index 0f391a89..7123485d 100644
--- a/app/components/modals/driver-form.js
+++ b/app/components/modals/driver-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/driver-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/driver-form';
diff --git a/app/components/modals/edit-meta-form.js b/app/components/modals/edit-meta-form.js
index 54af23dd..81b82068 100644
--- a/app/components/modals/edit-meta-form.js
+++ b/app/components/modals/edit-meta-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/edit-meta-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/edit-meta-form';
diff --git a/app/components/modals/entity-form.js b/app/components/modals/entity-form.js
index 43cd80bc..37332634 100644
--- a/app/components/modals/entity-form.js
+++ b/app/components/modals/entity-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/entity-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/entity-form';
diff --git a/app/components/modals/entity-meta-field-prompt.js b/app/components/modals/entity-meta-field-prompt.js
index f8be1ed3..d06bea4e 100644
--- a/app/components/modals/entity-meta-field-prompt.js
+++ b/app/components/modals/entity-meta-field-prompt.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/entity-meta-field-prompt';
+export { default } from '@fleetbase/fleetops-engine/components/modals/entity-meta-field-prompt';
diff --git a/app/components/modals/fleet-details.js b/app/components/modals/fleet-details.js
index 27724afa..2f07115d 100644
--- a/app/components/modals/fleet-details.js
+++ b/app/components/modals/fleet-details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/fleet-details';
+export { default } from '@fleetbase/fleetops-engine/components/modals/fleet-details';
diff --git a/app/components/modals/fleet-form.js b/app/components/modals/fleet-form.js
index 427f042a..7176cf4f 100644
--- a/app/components/modals/fleet-form.js
+++ b/app/components/modals/fleet-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/fleet-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/fleet-form';
diff --git a/app/components/modals/fuel-report-details.js b/app/components/modals/fuel-report-details.js
index 472ce3e6..4429d145 100644
--- a/app/components/modals/fuel-report-details.js
+++ b/app/components/modals/fuel-report-details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/fuel-report-details';
+export { default } from '@fleetbase/fleetops-engine/components/modals/fuel-report-details';
diff --git a/app/components/modals/fuel-report-form.js b/app/components/modals/fuel-report-form.js
index 2131223b..3aac5d0e 100644
--- a/app/components/modals/fuel-report-form.js
+++ b/app/components/modals/fuel-report-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/fuel-report-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/fuel-report-form';
diff --git a/app/components/modals/group-details.js b/app/components/modals/group-details.js
index b31137a6..3f9351ba 100644
--- a/app/components/modals/group-details.js
+++ b/app/components/modals/group-details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/group-details';
+export { default } from '@fleetbase/fleetops-engine/components/modals/group-details';
diff --git a/app/components/modals/group-form.js b/app/components/modals/group-form.js
index 6f7b37bb..2bc902a2 100644
--- a/app/components/modals/group-form.js
+++ b/app/components/modals/group-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/group-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/group-form';
diff --git a/app/components/modals/install-prompt.js b/app/components/modals/install-prompt.js
index 44ddec2c..036b4e31 100644
--- a/app/components/modals/install-prompt.js
+++ b/app/components/modals/install-prompt.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/install-prompt';
+export { default } from '@fleetbase/fleetops-engine/components/modals/install-prompt';
diff --git a/app/components/modals/map-field-form.js b/app/components/modals/map-field-form.js
index 24017731..0bb5a735 100644
--- a/app/components/modals/map-field-form.js
+++ b/app/components/modals/map-field-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/map-field-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/map-field-form';
diff --git a/app/components/modals/map-field-group-form.js b/app/components/modals/map-field-group-form.js
index 95d55876..fbeb67b6 100644
--- a/app/components/modals/map-field-group-form.js
+++ b/app/components/modals/map-field-group-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/map-field-group-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/map-field-group-form';
diff --git a/app/components/modals/map-layer-form.js b/app/components/modals/map-layer-form.js
index 6e348155..21472eae 100644
--- a/app/components/modals/map-layer-form.js
+++ b/app/components/modals/map-layer-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/map-layer-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/map-layer-form';
diff --git a/app/components/modals/meta-field-form.js b/app/components/modals/meta-field-form.js
index dc02e00d..66f68888 100644
--- a/app/components/modals/meta-field-form.js
+++ b/app/components/modals/meta-field-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/meta-field-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/meta-field-form';
diff --git a/app/components/modals/meta-field-group-form.js b/app/components/modals/meta-field-group-form.js
index c26e0feb..54e87402 100644
--- a/app/components/modals/meta-field-group-form.js
+++ b/app/components/modals/meta-field-group-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/meta-field-group-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/meta-field-group-form';
diff --git a/app/components/modals/new-order-config.js b/app/components/modals/new-order-config.js
index 6c72a12d..82741d29 100644
--- a/app/components/modals/new-order-config.js
+++ b/app/components/modals/new-order-config.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/new-order-config';
+export { default } from '@fleetbase/fleetops-engine/components/modals/new-order-config';
diff --git a/app/components/modals/option-prompt.js b/app/components/modals/option-prompt.js
index b08049e3..e1527fda 100644
--- a/app/components/modals/option-prompt.js
+++ b/app/components/modals/option-prompt.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/option-prompt';
+export { default } from '@fleetbase/fleetops-engine/components/modals/option-prompt';
diff --git a/app/components/modals/order-assign-driver.js b/app/components/modals/order-assign-driver.js
index 49f35031..8288da40 100644
--- a/app/components/modals/order-assign-driver.js
+++ b/app/components/modals/order-assign-driver.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/order-assign-driver';
+export { default } from '@fleetbase/fleetops-engine/components/modals/order-assign-driver';
diff --git a/app/components/modals/order-config-new-status.js b/app/components/modals/order-config-new-status.js
index 5a667fd3..489d373e 100644
--- a/app/components/modals/order-config-new-status.js
+++ b/app/components/modals/order-config-new-status.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/order-config-new-status';
+export { default } from '@fleetbase/fleetops-engine/components/modals/order-config-new-status';
diff --git a/app/components/modals/order-event.js b/app/components/modals/order-event.js
index 4f7b87bc..3e426597 100644
--- a/app/components/modals/order-event.js
+++ b/app/components/modals/order-event.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/order-event';
+export { default } from '@fleetbase/fleetops-engine/components/modals/order-event';
diff --git a/app/components/modals/order-form.js b/app/components/modals/order-form.js
index 8c7723e9..aefa4972 100644
--- a/app/components/modals/order-form.js
+++ b/app/components/modals/order-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/order-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/order-form';
diff --git a/app/components/modals/order-import.js b/app/components/modals/order-import.js
index 6eaf3269..57e58c6b 100644
--- a/app/components/modals/order-import.js
+++ b/app/components/modals/order-import.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/order-import';
+export { default } from '@fleetbase/fleetops-engine/components/modals/order-import';
diff --git a/app/components/modals/order-label.js b/app/components/modals/order-label.js
index fbf7a8ca..8c8f40fe 100644
--- a/app/components/modals/order-label.js
+++ b/app/components/modals/order-label.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/order-label';
+export { default } from '@fleetbase/fleetops-engine/components/modals/order-label';
diff --git a/app/components/modals/order-meta.js b/app/components/modals/order-meta.js
index ed7de85c..ff358f29 100644
--- a/app/components/modals/order-meta.js
+++ b/app/components/modals/order-meta.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/order-meta';
+export { default } from '@fleetbase/fleetops-engine/components/modals/order-meta';
diff --git a/app/components/modals/order-new-activity.js b/app/components/modals/order-new-activity.js
index df1fc00d..091cf58b 100644
--- a/app/components/modals/order-new-activity.js
+++ b/app/components/modals/order-new-activity.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/order-new-activity';
+export { default } from '@fleetbase/fleetops-engine/components/modals/order-new-activity';
diff --git a/app/components/modals/order-route-form.js b/app/components/modals/order-route-form.js
index d40e489b..95b4b235 100644
--- a/app/components/modals/order-route-form.js
+++ b/app/components/modals/order-route-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/order-route-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/order-route-form';
diff --git a/app/components/modals/place-assign-vendor.js b/app/components/modals/place-assign-vendor.js
index 10a26805..4637b6cd 100644
--- a/app/components/modals/place-assign-vendor.js
+++ b/app/components/modals/place-assign-vendor.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/place-assign-vendor';
+export { default } from '@fleetbase/fleetops-engine/components/modals/place-assign-vendor';
diff --git a/app/components/modals/place-details.js b/app/components/modals/place-details.js
index 19116b87..76fa93d0 100644
--- a/app/components/modals/place-details.js
+++ b/app/components/modals/place-details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/place-details';
+export { default } from '@fleetbase/fleetops-engine/components/modals/place-details';
diff --git a/app/components/modals/place-form.js b/app/components/modals/place-form.js
index 967c0be7..94bc1175 100644
--- a/app/components/modals/place-form.js
+++ b/app/components/modals/place-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/place-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/place-form';
diff --git a/app/components/modals/point-map.js b/app/components/modals/point-map.js
index d5adb7ac..d96fa18f 100644
--- a/app/components/modals/point-map.js
+++ b/app/components/modals/point-map.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/point-map';
+export { default } from '@fleetbase/fleetops-engine/components/modals/point-map';
diff --git a/app/components/modals/policy-form.js b/app/components/modals/policy-form.js
index 015b4fc0..25686be5 100644
--- a/app/components/modals/policy-form.js
+++ b/app/components/modals/policy-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/policy-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/policy-form';
diff --git a/app/components/modals/role-form.js b/app/components/modals/role-form.js
index 1a477da9..393284df 100644
--- a/app/components/modals/role-form.js
+++ b/app/components/modals/role-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/role-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/role-form';
diff --git a/app/components/modals/select-payment-method.js b/app/components/modals/select-payment-method.js
index 1b446045..7435db72 100644
--- a/app/components/modals/select-payment-method.js
+++ b/app/components/modals/select-payment-method.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/select-payment-method';
+export { default } from '@fleetbase/fleetops-engine/components/modals/select-payment-method';
diff --git a/app/components/modals/service-area-form.js b/app/components/modals/service-area-form.js
index 30006fd6..bacba679 100644
--- a/app/components/modals/service-area-form.js
+++ b/app/components/modals/service-area-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/service-area-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/service-area-form';
diff --git a/app/components/modals/set-password.js b/app/components/modals/set-password.js
index b512915c..1e91fe5c 100644
--- a/app/components/modals/set-password.js
+++ b/app/components/modals/set-password.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/set-password';
+export { default } from '@fleetbase/fleetops-engine/components/modals/set-password';
diff --git a/app/components/modals/uninstall-prompt.js b/app/components/modals/uninstall-prompt.js
index a49247df..0e86502a 100644
--- a/app/components/modals/uninstall-prompt.js
+++ b/app/components/modals/uninstall-prompt.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/uninstall-prompt';
+export { default } from '@fleetbase/fleetops-engine/components/modals/uninstall-prompt';
diff --git a/app/components/modals/user-form.js b/app/components/modals/user-form.js
index 406e8531..345f3710 100644
--- a/app/components/modals/user-form.js
+++ b/app/components/modals/user-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/user-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/user-form';
diff --git a/app/components/modals/vehicle-details.js b/app/components/modals/vehicle-details.js
index 6ea2e171..db261a97 100644
--- a/app/components/modals/vehicle-details.js
+++ b/app/components/modals/vehicle-details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/vehicle-details';
+export { default } from '@fleetbase/fleetops-engine/components/modals/vehicle-details';
diff --git a/app/components/modals/vehicle-form.js b/app/components/modals/vehicle-form.js
index 083e2f78..c217bb49 100644
--- a/app/components/modals/vehicle-form.js
+++ b/app/components/modals/vehicle-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/vehicle-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/vehicle-form';
diff --git a/app/components/modals/vendor-details.js b/app/components/modals/vendor-details.js
index 859a6701..1cdea27c 100644
--- a/app/components/modals/vendor-details.js
+++ b/app/components/modals/vendor-details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/vendor-details';
+export { default } from '@fleetbase/fleetops-engine/components/modals/vendor-details';
diff --git a/app/components/modals/vendor-form.js b/app/components/modals/vendor-form.js
index 036ba576..25cd1e4d 100644
--- a/app/components/modals/vendor-form.js
+++ b/app/components/modals/vendor-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/vendor-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/vendor-form';
diff --git a/app/components/modals/view-service-area.js b/app/components/modals/view-service-area.js
index 1940349b..4138204d 100644
--- a/app/components/modals/view-service-area.js
+++ b/app/components/modals/view-service-area.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/view-service-area';
+export { default } from '@fleetbase/fleetops-engine/components/modals/view-service-area';
diff --git a/app/components/modals/view-zone.js b/app/components/modals/view-zone.js
index 7b1330b6..921f5fed 100644
--- a/app/components/modals/view-zone.js
+++ b/app/components/modals/view-zone.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/view-zone';
+export { default } from '@fleetbase/fleetops-engine/components/modals/view-zone';
diff --git a/app/components/modals/zone-form.js b/app/components/modals/zone-form.js
index cc1029d0..473e52c0 100644
--- a/app/components/modals/zone-form.js
+++ b/app/components/modals/zone-form.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/modals/zone-form';
+export { default } from '@fleetbase/fleetops-engine/components/modals/zone-form';
diff --git a/app/components/operations-pane/pane.js b/app/components/operations-pane/pane.js
index a5d4d640..864c4b2e 100644
--- a/app/components/operations-pane/pane.js
+++ b/app/components/operations-pane/pane.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/operations-pane/pane';
+export { default } from '@fleetbase/fleetops-engine/components/operations-pane/pane';
diff --git a/app/components/order-board.js b/app/components/order-board.js
index dcfaf96e..333c9e3f 100644
--- a/app/components/order-board.js
+++ b/app/components/order-board.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order-board';
+export { default } from '@fleetbase/fleetops-engine/components/order-board';
diff --git a/app/components/order-config.js b/app/components/order-config.js
index 0e6bc14a..5a357468 100644
--- a/app/components/order-config.js
+++ b/app/components/order-config.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order-config';
+export { default } from '@fleetbase/fleetops-engine/components/order-config';
diff --git a/app/components/order-config/activity-flow-editor.js b/app/components/order-config/activity-flow-editor.js
index f3d3dcd4..2041eb4a 100644
--- a/app/components/order-config/activity-flow-editor.js
+++ b/app/components/order-config/activity-flow-editor.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order-config/activity-flow-editor';
+export { default } from '@fleetbase/fleetops-engine/components/order-config/activity-flow-editor';
diff --git a/app/components/order-config/details-editor.js b/app/components/order-config/details-editor.js
index 028e0760..0c9ad923 100644
--- a/app/components/order-config/details-editor.js
+++ b/app/components/order-config/details-editor.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order-config/details-editor';
+export { default } from '@fleetbase/fleetops-engine/components/order-config/details-editor';
diff --git a/app/components/order-config/entities-editor.js b/app/components/order-config/entities-editor.js
index a66f6c17..ac67bc5d 100644
--- a/app/components/order-config/entities-editor.js
+++ b/app/components/order-config/entities-editor.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order-config/entities-editor';
+export { default } from '@fleetbase/fleetops-engine/components/order-config/entities-editor';
diff --git a/app/components/order-config/fields-editor.js b/app/components/order-config/fields-editor.js
index 8c092355..482d9474 100644
--- a/app/components/order-config/fields-editor.js
+++ b/app/components/order-config/fields-editor.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order-config/fields-editor';
+export { default } from '@fleetbase/fleetops-engine/components/order-config/fields-editor';
diff --git a/app/components/order-config/selector.js b/app/components/order-config/selector.js
index 80baf1f1..7933b773 100644
--- a/app/components/order-config/selector.js
+++ b/app/components/order-config/selector.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order-config/selector';
+export { default } from '@fleetbase/fleetops-engine/components/order-config/selector';
diff --git a/app/components/order-list-overlay.js b/app/components/order-list-overlay.js
index a2c7912c..aa46dd1d 100644
--- a/app/components/order-list-overlay.js
+++ b/app/components/order-list-overlay.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order-list-overlay';
+export { default } from '@fleetbase/fleetops-engine/components/order-list-overlay';
diff --git a/app/components/order-list-overlay/driver-panel-title.js b/app/components/order-list-overlay/driver-panel-title.js
index 7fafd100..ded4b9be 100644
--- a/app/components/order-list-overlay/driver-panel-title.js
+++ b/app/components/order-list-overlay/driver-panel-title.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order-list-overlay/driver-panel-title';
+export { default } from '@fleetbase/fleetops-engine/components/order-list-overlay/driver-panel-title';
diff --git a/app/components/order-list-overlay/order.js b/app/components/order-list-overlay/order.js
index 0ddcfc88..ec4453de 100644
--- a/app/components/order-list-overlay/order.js
+++ b/app/components/order-list-overlay/order.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order-list-overlay/order';
+export { default } from '@fleetbase/fleetops-engine/components/order-list-overlay/order';
diff --git a/app/components/order/header.js b/app/components/order/header.js
index 64767afd..48939703 100644
--- a/app/components/order/header.js
+++ b/app/components/order/header.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order/header';
+export { default } from '@fleetbase/fleetops-engine/components/order/header';
diff --git a/app/components/order/place-card.js b/app/components/order/place-card.js
index fde07e4c..7a916329 100644
--- a/app/components/order/place-card.js
+++ b/app/components/order/place-card.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order/place-card';
+export { default } from '@fleetbase/fleetops-engine/components/order/place-card';
diff --git a/app/components/order/schedule-card.js b/app/components/order/schedule-card.js
index b29dd56a..030f5974 100644
--- a/app/components/order/schedule-card.js
+++ b/app/components/order/schedule-card.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order/schedule-card';
+export { default } from '@fleetbase/fleetops-engine/components/order/schedule-card';
diff --git a/app/components/order/sub-header.js b/app/components/order/sub-header.js
index a7a588b4..11e74de1 100644
--- a/app/components/order/sub-header.js
+++ b/app/components/order/sub-header.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order/sub-header';
+export { default } from '@fleetbase/fleetops-engine/components/order/sub-header';
diff --git a/app/components/order/sub-header/item.js b/app/components/order/sub-header/item.js
index 67f3a786..4c056140 100644
--- a/app/components/order/sub-header/item.js
+++ b/app/components/order/sub-header/item.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/order/sub-header/item';
+export { default } from '@fleetbase/fleetops-engine/components/order/sub-header/item';
diff --git a/app/components/route-list.js b/app/components/route-list.js
index d5e3ad73..ce036cae 100644
--- a/app/components/route-list.js
+++ b/app/components/route-list.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/route-list';
+export { default } from '@fleetbase/fleetops-engine/components/route-list';
diff --git a/app/components/settings-window.js b/app/components/settings-window.js
index 758e9c27..790ba28f 100644
--- a/app/components/settings-window.js
+++ b/app/components/settings-window.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/settings-window';
+export { default } from '@fleetbase/fleetops-engine/components/settings-window';
diff --git a/app/components/split-grid.js b/app/components/split-grid.js
index cd2bec1a..548192c7 100644
--- a/app/components/split-grid.js
+++ b/app/components/split-grid.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/split-grid';
+export { default } from '@fleetbase/fleetops-engine/components/split-grid';
diff --git a/app/components/vehicle-form-panel.js b/app/components/vehicle-form-panel.js
index 09705362..a0d65588 100644
--- a/app/components/vehicle-form-panel.js
+++ b/app/components/vehicle-form-panel.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/vehicle-form-panel';
+export { default } from '@fleetbase/fleetops-engine/components/vehicle-form-panel';
diff --git a/app/components/vehicle-panel.js b/app/components/vehicle-panel.js
index 737d8ad1..815f5628 100644
--- a/app/components/vehicle-panel.js
+++ b/app/components/vehicle-panel.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/vehicle-panel';
+export { default } from '@fleetbase/fleetops-engine/components/vehicle-panel';
diff --git a/app/components/vehicle-panel/details.js b/app/components/vehicle-panel/details.js
index 8be72bd5..e57a9aa6 100644
--- a/app/components/vehicle-panel/details.js
+++ b/app/components/vehicle-panel/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/vehicle-panel/details';
+export { default } from '@fleetbase/fleetops-engine/components/vehicle-panel/details';
diff --git a/app/components/vehicle-panel/tracking.js b/app/components/vehicle-panel/tracking.js
index 2a6533cc..be02cc9a 100644
--- a/app/components/vehicle-panel/tracking.js
+++ b/app/components/vehicle-panel/tracking.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/vehicle-panel/tracking';
+export { default } from '@fleetbase/fleetops-engine/components/vehicle-panel/tracking';
diff --git a/app/components/widget/issues.js b/app/components/widget/issues.js
index b000b6dd..3969f299 100644
--- a/app/components/widget/issues.js
+++ b/app/components/widget/issues.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/widget/issues';
+export { default } from '@fleetbase/fleetops-engine/components/widget/issues';
diff --git a/app/components/widget/key-metrics.js b/app/components/widget/key-metrics.js
index 194c2d47..3f13c289 100644
--- a/app/components/widget/key-metrics.js
+++ b/app/components/widget/key-metrics.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/widget/key-metrics';
+export { default } from '@fleetbase/fleetops-engine/components/widget/key-metrics';
diff --git a/app/components/widget/live-order-map.js b/app/components/widget/live-order-map.js
index bd49fd94..9b3e4db7 100644
--- a/app/components/widget/live-order-map.js
+++ b/app/components/widget/live-order-map.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/widget/live-order-map';
+export { default } from '@fleetbase/fleetops-engine/components/widget/live-order-map';
diff --git a/app/components/widget/recent-orders.js b/app/components/widget/recent-orders.js
index 047765fa..b6a36bff 100644
--- a/app/components/widget/recent-orders.js
+++ b/app/components/widget/recent-orders.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/widget/recent-orders';
+export { default } from '@fleetbase/fleetops-engine/components/widget/recent-orders';
diff --git a/app/components/widget/recommended-todo.js b/app/components/widget/recommended-todo.js
index 7ac36f6b..bb32552b 100644
--- a/app/components/widget/recommended-todo.js
+++ b/app/components/widget/recommended-todo.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/widget/recommended-todo';
+export { default } from '@fleetbase/fleetops-engine/components/widget/recommended-todo';
diff --git a/app/components/widget/transaction-earnings.js b/app/components/widget/transaction-earnings.js
index 430a0c11..cdf31a4d 100644
--- a/app/components/widget/transaction-earnings.js
+++ b/app/components/widget/transaction-earnings.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/widget/transaction-earnings';
+export { default } from '@fleetbase/fleetops-engine/components/widget/transaction-earnings';
diff --git a/app/components/widget/transactions.js b/app/components/widget/transactions.js
index 8cf58e6b..0507ca99 100644
--- a/app/components/widget/transactions.js
+++ b/app/components/widget/transactions.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/widget/transactions';
+export { default } from '@fleetbase/fleetops-engine/components/widget/transactions';
diff --git a/app/components/widget/weekly-orders.js b/app/components/widget/weekly-orders.js
index 5df3a224..b461d5d7 100644
--- a/app/components/widget/weekly-orders.js
+++ b/app/components/widget/weekly-orders.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/components/widget/weekly-orders';
+export { default } from '@fleetbase/fleetops-engine/components/widget/weekly-orders';
diff --git a/app/controllers/application.js b/app/controllers/application.js
index e8b4fc59..e68683e9 100644
--- a/app/controllers/application.js
+++ b/app/controllers/application.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/application';
+export { default } from '@fleetbase/fleetops-engine/controllers/application';
diff --git a/app/controllers/management.js b/app/controllers/management.js
index a60a57ab..83416b5b 100644
--- a/app/controllers/management.js
+++ b/app/controllers/management.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management';
+export { default } from '@fleetbase/fleetops-engine/controllers/management';
diff --git a/app/controllers/management/contacts/index.js b/app/controllers/management/contacts/index.js
index 2cc79324..6df5c586 100644
--- a/app/controllers/management/contacts/index.js
+++ b/app/controllers/management/contacts/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/contacts/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/contacts/index';
diff --git a/app/controllers/management/drivers/index.js b/app/controllers/management/drivers/index.js
index 1e38f108..5bbb0f9d 100644
--- a/app/controllers/management/drivers/index.js
+++ b/app/controllers/management/drivers/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/drivers/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/drivers/index';
diff --git a/app/controllers/management/drivers/index/details.js b/app/controllers/management/drivers/index/details.js
index e0cb056d..b4bba44e 100644
--- a/app/controllers/management/drivers/index/details.js
+++ b/app/controllers/management/drivers/index/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/drivers/index/details';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/drivers/index/details';
diff --git a/app/controllers/management/drivers/index/new.js b/app/controllers/management/drivers/index/new.js
index 0cad0b20..8670555d 100644
--- a/app/controllers/management/drivers/index/new.js
+++ b/app/controllers/management/drivers/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/drivers/index/new';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/drivers/index/new';
diff --git a/app/controllers/management/fleets/index.js b/app/controllers/management/fleets/index.js
index 2b432212..95aa90ed 100644
--- a/app/controllers/management/fleets/index.js
+++ b/app/controllers/management/fleets/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/fleets/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/fleets/index';
diff --git a/app/controllers/management/fleets/index/details.js b/app/controllers/management/fleets/index/details.js
index b98373bc..55933f8a 100644
--- a/app/controllers/management/fleets/index/details.js
+++ b/app/controllers/management/fleets/index/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/fleets/index/details';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/fleets/index/details';
diff --git a/app/controllers/management/fuel-reports/index.js b/app/controllers/management/fuel-reports/index.js
index 092e6e32..9571c4c9 100644
--- a/app/controllers/management/fuel-reports/index.js
+++ b/app/controllers/management/fuel-reports/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/fuel-reports/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/fuel-reports/index';
diff --git a/app/controllers/management/issues/index.js b/app/controllers/management/issues/index.js
index ec2df0b6..36f0221c 100644
--- a/app/controllers/management/issues/index.js
+++ b/app/controllers/management/issues/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/issues/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/issues/index';
diff --git a/app/controllers/management/places/index.js b/app/controllers/management/places/index.js
index 1c7307fc..ffdc9fe5 100644
--- a/app/controllers/management/places/index.js
+++ b/app/controllers/management/places/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/places/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/places/index';
diff --git a/app/controllers/management/vehicles/index.js b/app/controllers/management/vehicles/index.js
index 0087038d..003597a6 100644
--- a/app/controllers/management/vehicles/index.js
+++ b/app/controllers/management/vehicles/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/vehicles/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/vehicles/index';
diff --git a/app/controllers/management/vehicles/index/details.js b/app/controllers/management/vehicles/index/details.js
index 13dae4b3..d450f791 100644
--- a/app/controllers/management/vehicles/index/details.js
+++ b/app/controllers/management/vehicles/index/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/vehicles/index/details';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/vehicles/index/details';
diff --git a/app/controllers/management/vehicles/index/new.js b/app/controllers/management/vehicles/index/new.js
index 96338a3e..a341c49c 100644
--- a/app/controllers/management/vehicles/index/new.js
+++ b/app/controllers/management/vehicles/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/vehicles/index/new';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/vehicles/index/new';
diff --git a/app/controllers/management/vendors/index.js b/app/controllers/management/vendors/index.js
index 80539ee2..48a0cefa 100644
--- a/app/controllers/management/vendors/index.js
+++ b/app/controllers/management/vendors/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/vendors/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/vendors/index';
diff --git a/app/controllers/management/vendors/index/details.js b/app/controllers/management/vendors/index/details.js
index eaa28257..d8bffdad 100644
--- a/app/controllers/management/vendors/index/details.js
+++ b/app/controllers/management/vendors/index/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/vendors/index/details';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/vendors/index/details';
diff --git a/app/controllers/management/vendors/index/details/remarks.js b/app/controllers/management/vendors/index/details/remarks.js
index c7cb4619..6930013a 100644
--- a/app/controllers/management/vendors/index/details/remarks.js
+++ b/app/controllers/management/vendors/index/details/remarks.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/management/vendors/index/details/remarks';
+export { default } from '@fleetbase/fleetops-engine/controllers/management/vendors/index/details/remarks';
diff --git a/app/controllers/operations/orders/index/config.js b/app/controllers/operations/orders/index/config.js
index 2a698787..1cc18962 100644
--- a/app/controllers/operations/orders/index/config.js
+++ b/app/controllers/operations/orders/index/config.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/operations/orders/index/config';
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/orders/index/config';
diff --git a/app/controllers/operations/orders/index/config/types.js b/app/controllers/operations/orders/index/config/types.js
index c90aa12c..576b97f6 100644
--- a/app/controllers/operations/orders/index/config/types.js
+++ b/app/controllers/operations/orders/index/config/types.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/operations/orders/index/config/types';
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/orders/index/config/types';
diff --git a/app/controllers/operations/orders/index/new.js b/app/controllers/operations/orders/index/new.js
index d1c9bd15..eaeee194 100644
--- a/app/controllers/operations/orders/index/new.js
+++ b/app/controllers/operations/orders/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/operations/orders/index/new';
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/orders/index/new';
diff --git a/app/controllers/operations/orders/index/view.js b/app/controllers/operations/orders/index/view.js
index d9b141b8..141f31c5 100644
--- a/app/controllers/operations/orders/index/view.js
+++ b/app/controllers/operations/orders/index/view.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/operations/orders/index/view';
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/orders/index/view';
diff --git a/app/controllers/operations/scheduler/index.js b/app/controllers/operations/scheduler/index.js
index 56603780..d9dae84d 100644
--- a/app/controllers/operations/scheduler/index.js
+++ b/app/controllers/operations/scheduler/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/operations/scheduler/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/scheduler/index';
diff --git a/app/controllers/operations/service-rates/index.js b/app/controllers/operations/service-rates/index.js
index 7cb678f3..5bcd4497 100644
--- a/app/controllers/operations/service-rates/index.js
+++ b/app/controllers/operations/service-rates/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/operations/service-rates/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/service-rates/index';
diff --git a/app/controllers/operations/service-rates/index/edit.js b/app/controllers/operations/service-rates/index/edit.js
index 66780b26..61d2974e 100644
--- a/app/controllers/operations/service-rates/index/edit.js
+++ b/app/controllers/operations/service-rates/index/edit.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/operations/service-rates/index/edit';
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/service-rates/index/edit';
diff --git a/app/controllers/operations/service-rates/index/new.js b/app/controllers/operations/service-rates/index/new.js
index 188dff2a..a264c85d 100644
--- a/app/controllers/operations/service-rates/index/new.js
+++ b/app/controllers/operations/service-rates/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/operations/service-rates/index/new';
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/service-rates/index/new';
diff --git a/app/controllers/operations/zones/index.js b/app/controllers/operations/zones/index.js
index 874a208a..72cdc648 100644
--- a/app/controllers/operations/zones/index.js
+++ b/app/controllers/operations/zones/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/controllers/operations/zones/index';
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/zones/index';
diff --git a/app/helpers/avatar-url.js b/app/helpers/avatar-url.js
index 886d3252..a741b4b1 100644
--- a/app/helpers/avatar-url.js
+++ b/app/helpers/avatar-url.js
@@ -1 +1 @@
-export { default, avatarUrl } from '@fleetbase/fleetops/helpers/avatar-url';
+export { default, avatarUrl } from '@fleetbase/fleetops-engine/helpers/avatar-url';
diff --git a/app/helpers/extract-coordinates.js b/app/helpers/extract-coordinates.js
index 78f8b1a8..b0c7fec1 100644
--- a/app/helpers/extract-coordinates.js
+++ b/app/helpers/extract-coordinates.js
@@ -1 +1 @@
-export { default, extractCoordinates } from '@fleetbase/fleetops/helpers/extract-coordinates';
+export { default, extractCoordinates } from '@fleetbase/fleetops-engine/helpers/extract-coordinates';
diff --git a/app/helpers/feature-group.js b/app/helpers/feature-group.js
index 78c1a4cb..9fc21e83 100644
--- a/app/helpers/feature-group.js
+++ b/app/helpers/feature-group.js
@@ -1 +1 @@
-export { default, featureGroup } from '@fleetbase/fleetops/helpers/feature-group';
+export { default, featureGroup } from '@fleetbase/fleetops-engine/helpers/feature-group';
diff --git a/app/helpers/flow-raw-status.js b/app/helpers/flow-raw-status.js
index 5f8df3f7..5f3a27e7 100644
--- a/app/helpers/flow-raw-status.js
+++ b/app/helpers/flow-raw-status.js
@@ -1 +1 @@
-export { default, flowRawStatus } from '@fleetbase/fleetops/helpers/flow-raw-status';
+export { default, flowRawStatus } from '@fleetbase/fleetops-engine/helpers/flow-raw-status';
diff --git a/app/helpers/format-point.js b/app/helpers/format-point.js
index 32bac0ca..ada11c39 100644
--- a/app/helpers/format-point.js
+++ b/app/helpers/format-point.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/helpers/format-point';
+export { default } from '@fleetbase/fleetops-engine/helpers/format-point';
diff --git a/app/helpers/get-tip-amount.js b/app/helpers/get-tip-amount.js
index cbef09c7..1a73afd5 100644
--- a/app/helpers/get-tip-amount.js
+++ b/app/helpers/get-tip-amount.js
@@ -1 +1 @@
-export { default, getTipAmount } from '@fleetbase/fleetops/helpers/get-tip-amount';
+export { default, getTipAmount } from '@fleetbase/fleetops-engine/helpers/get-tip-amount';
diff --git a/app/helpers/is-facilitator-supported-place.js b/app/helpers/is-facilitator-supported-place.js
index 73f8b307..0b6b884b 100644
--- a/app/helpers/is-facilitator-supported-place.js
+++ b/app/helpers/is-facilitator-supported-place.js
@@ -1 +1 @@
-export { default, isFacilitatorSupportedPlace } from '@fleetbase/fleetops/helpers/is-facilitator-supported-place';
+export { default, isFacilitatorSupportedPlace } from '@fleetbase/fleetops-engine/helpers/is-facilitator-supported-place';
diff --git a/app/helpers/is-not-facilitator-supported-place.js b/app/helpers/is-not-facilitator-supported-place.js
index 6c25ab3c..a0de5dde 100644
--- a/app/helpers/is-not-facilitator-supported-place.js
+++ b/app/helpers/is-not-facilitator-supported-place.js
@@ -1 +1 @@
-export { default, isNotFacilitatorSupportedPlace } from '@fleetbase/fleetops/helpers/is-not-facilitator-supported-place';
+export { default, isNotFacilitatorSupportedPlace } from '@fleetbase/fleetops-engine/helpers/is-not-facilitator-supported-place';
diff --git a/app/helpers/is-section-visible.js b/app/helpers/is-section-visible.js
index 577daf19..66752f18 100644
--- a/app/helpers/is-section-visible.js
+++ b/app/helpers/is-section-visible.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/helpers/is-section-visible';
+export { default } from '@fleetbase/fleetops-engine/helpers/is-section-visible';
diff --git a/app/helpers/is-waypoint-record.js b/app/helpers/is-waypoint-record.js
index f041451c..6587b964 100644
--- a/app/helpers/is-waypoint-record.js
+++ b/app/helpers/is-waypoint-record.js
@@ -1 +1 @@
-export { default, isWaypointRecord } from '@fleetbase/fleetops/helpers/is-waypoint-record';
+export { default, isWaypointRecord } from '@fleetbase/fleetops-engine/helpers/is-waypoint-record';
diff --git a/app/helpers/point-coordinates.js b/app/helpers/point-coordinates.js
index 032ded8e..de64becb 100644
--- a/app/helpers/point-coordinates.js
+++ b/app/helpers/point-coordinates.js
@@ -1 +1 @@
-export { default, pointCoordinates } from '@fleetbase/fleetops/helpers/point-coordinates';
+export { default, pointCoordinates } from '@fleetbase/fleetops-engine/helpers/point-coordinates';
diff --git a/app/helpers/point-to-coordinates.js b/app/helpers/point-to-coordinates.js
index 915138d6..ee1db105 100644
--- a/app/helpers/point-to-coordinates.js
+++ b/app/helpers/point-to-coordinates.js
@@ -1 +1 @@
-export { default, pointToCoordinates } from '@fleetbase/fleetops/helpers/point-to-coordinates';
+export { default, pointToCoordinates } from '@fleetbase/fleetops-engine/helpers/point-to-coordinates';
diff --git a/app/helpers/service-name.js b/app/helpers/service-name.js
index d547129a..5a2d5022 100644
--- a/app/helpers/service-name.js
+++ b/app/helpers/service-name.js
@@ -1 +1 @@
-export { default, serviceName } from '@fleetbase/fleetops/helpers/service-name';
+export { default, serviceName } from '@fleetbase/fleetops-engine/helpers/service-name';
diff --git a/app/helpers/waypoint-label.js b/app/helpers/waypoint-label.js
index ac209270..cf51e98d 100644
--- a/app/helpers/waypoint-label.js
+++ b/app/helpers/waypoint-label.js
@@ -1 +1 @@
-export { default, waypointLabel } from '@fleetbase/fleetops/helpers/waypoint-label';
+export { default, waypointLabel } from '@fleetbase/fleetops-engine/helpers/waypoint-label';
diff --git a/app/modifiers/translate-x.js b/app/modifiers/translate-x.js
index ece9fb6e..88f70e8d 100644
--- a/app/modifiers/translate-x.js
+++ b/app/modifiers/translate-x.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/modifiers/translate-x';
+export { default } from '@fleetbase/fleetops-engine/modifiers/translate-x';
diff --git a/app/routes/home.js b/app/routes/home.js
index 72a2786a..37148af6 100644
--- a/app/routes/home.js
+++ b/app/routes/home.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/home';
+export { default } from '@fleetbase/fleetops-engine/routes/home';
diff --git a/app/routes/management/drivers/index/details.js b/app/routes/management/drivers/index/details.js
index a44e9fa5..d8e57792 100644
--- a/app/routes/management/drivers/index/details.js
+++ b/app/routes/management/drivers/index/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/management/drivers/index/details';
+export { default } from '@fleetbase/fleetops-engine/routes/management/drivers/index/details';
diff --git a/app/routes/management/drivers/index/edit.js b/app/routes/management/drivers/index/edit.js
index 4138af63..e12ff04f 100644
--- a/app/routes/management/drivers/index/edit.js
+++ b/app/routes/management/drivers/index/edit.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/management/drivers/index/edit';
+export { default } from '@fleetbase/fleetops-engine/routes/management/drivers/index/edit';
diff --git a/app/routes/management/drivers/index/new.js b/app/routes/management/drivers/index/new.js
index 55368c56..d7a2a186 100644
--- a/app/routes/management/drivers/index/new.js
+++ b/app/routes/management/drivers/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/management/drivers/index/new';
+export { default } from '@fleetbase/fleetops-engine/routes/management/drivers/index/new';
diff --git a/app/routes/management/fleets/index/details.js b/app/routes/management/fleets/index/details.js
index df32385e..ee0c4a02 100644
--- a/app/routes/management/fleets/index/details.js
+++ b/app/routes/management/fleets/index/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/management/fleets/index/details';
+export { default } from '@fleetbase/fleetops-engine/routes/management/fleets/index/details';
diff --git a/app/routes/management/vehicles/index/details.js b/app/routes/management/vehicles/index/details.js
index 65713381..c4a35a10 100644
--- a/app/routes/management/vehicles/index/details.js
+++ b/app/routes/management/vehicles/index/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/management/vehicles/index/details';
+export { default } from '@fleetbase/fleetops-engine/routes/management/vehicles/index/details';
diff --git a/app/routes/management/vehicles/index/edit.js b/app/routes/management/vehicles/index/edit.js
index 1df66c20..b2cb87c2 100644
--- a/app/routes/management/vehicles/index/edit.js
+++ b/app/routes/management/vehicles/index/edit.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/management/vehicles/index/edit';
+export { default } from '@fleetbase/fleetops-engine/routes/management/vehicles/index/edit';
diff --git a/app/routes/management/vehicles/index/new.js b/app/routes/management/vehicles/index/new.js
index b0bcdd0e..02fec631 100644
--- a/app/routes/management/vehicles/index/new.js
+++ b/app/routes/management/vehicles/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/management/vehicles/index/new';
+export { default } from '@fleetbase/fleetops-engine/routes/management/vehicles/index/new';
diff --git a/app/routes/operations/orders/index/config.js b/app/routes/operations/orders/index/config.js
index 0a42ae96..16ea20f3 100644
--- a/app/routes/operations/orders/index/config.js
+++ b/app/routes/operations/orders/index/config.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/operations/orders/index/config';
+export { default } from '@fleetbase/fleetops-engine/routes/operations/orders/index/config';
diff --git a/app/routes/operations/orders/index/config/types.js b/app/routes/operations/orders/index/config/types.js
index 436851b3..1cf87980 100644
--- a/app/routes/operations/orders/index/config/types.js
+++ b/app/routes/operations/orders/index/config/types.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/operations/orders/index/config/types';
+export { default } from '@fleetbase/fleetops-engine/routes/operations/orders/index/config/types';
diff --git a/app/routes/operations/orders/index/new.js b/app/routes/operations/orders/index/new.js
index e0f53b19..b3f251b9 100644
--- a/app/routes/operations/orders/index/new.js
+++ b/app/routes/operations/orders/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/operations/orders/index/new';
+export { default } from '@fleetbase/fleetops-engine/routes/operations/orders/index/new';
diff --git a/app/routes/operations/orders/index/view.js b/app/routes/operations/orders/index/view.js
index 61970801..e7ea00d0 100644
--- a/app/routes/operations/orders/index/view.js
+++ b/app/routes/operations/orders/index/view.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/operations/orders/index/view';
+export { default } from '@fleetbase/fleetops-engine/routes/operations/orders/index/view';
diff --git a/app/routes/operations/scheduler.js b/app/routes/operations/scheduler.js
index 3c29cf93..2c709db3 100644
--- a/app/routes/operations/scheduler.js
+++ b/app/routes/operations/scheduler.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/operations/scheduler';
+export { default } from '@fleetbase/fleetops-engine/routes/operations/scheduler';
diff --git a/app/routes/operations/scheduler/index.js b/app/routes/operations/scheduler/index.js
index a548a4a5..0780133f 100644
--- a/app/routes/operations/scheduler/index.js
+++ b/app/routes/operations/scheduler/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/operations/scheduler/index';
+export { default } from '@fleetbase/fleetops-engine/routes/operations/scheduler/index';
diff --git a/app/routes/operations/service-rates/index/edit.js b/app/routes/operations/service-rates/index/edit.js
index 438cd426..22165c22 100644
--- a/app/routes/operations/service-rates/index/edit.js
+++ b/app/routes/operations/service-rates/index/edit.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/operations/service-rates/index/edit';
+export { default } from '@fleetbase/fleetops-engine/routes/operations/service-rates/index/edit';
diff --git a/app/routes/operations/service-rates/index/new.js b/app/routes/operations/service-rates/index/new.js
index f2d7df03..7e271f0c 100644
--- a/app/routes/operations/service-rates/index/new.js
+++ b/app/routes/operations/service-rates/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/operations/service-rates/index/new';
+export { default } from '@fleetbase/fleetops-engine/routes/operations/service-rates/index/new';
diff --git a/app/routes/virtual.js b/app/routes/virtual.js
index 2b24b283..ad12aeab 100644
--- a/app/routes/virtual.js
+++ b/app/routes/virtual.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/routes/virtual';
+export { default } from '@fleetbase/fleetops-engine/routes/virtual';
diff --git a/app/services/map-manager.js b/app/services/map-manager.js
index 7dd96ddc..f0f49846 100644
--- a/app/services/map-manager.js
+++ b/app/services/map-manager.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/services/map-manager';
+export { default } from '@fleetbase/fleetops-engine/services/map-manager';
diff --git a/app/services/service-areas.js b/app/services/service-areas.js
index 196555cb..c2ad463c 100644
--- a/app/services/service-areas.js
+++ b/app/services/service-areas.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/services/service-areas';
+export { default } from '@fleetbase/fleetops-engine/services/service-areas';
diff --git a/app/templates/home.js b/app/templates/home.js
index b41537a6..85eadf86 100644
--- a/app/templates/home.js
+++ b/app/templates/home.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/home';
+export { default } from '@fleetbase/fleetops-engine/templates/home';
diff --git a/app/templates/management/drivers/index/details.js b/app/templates/management/drivers/index/details.js
index fa9cbf03..d9cbf1bd 100644
--- a/app/templates/management/drivers/index/details.js
+++ b/app/templates/management/drivers/index/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/management/drivers/index/details';
+export { default } from '@fleetbase/fleetops-engine/templates/management/drivers/index/details';
diff --git a/app/templates/management/drivers/index/edit.js b/app/templates/management/drivers/index/edit.js
index bfe07a97..c3d895da 100644
--- a/app/templates/management/drivers/index/edit.js
+++ b/app/templates/management/drivers/index/edit.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/management/drivers/index/edit';
+export { default } from '@fleetbase/fleetops-engine/templates/management/drivers/index/edit';
diff --git a/app/templates/management/drivers/index/new.js b/app/templates/management/drivers/index/new.js
index 1175df25..5920c2ce 100644
--- a/app/templates/management/drivers/index/new.js
+++ b/app/templates/management/drivers/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/management/drivers/index/new';
+export { default } from '@fleetbase/fleetops-engine/templates/management/drivers/index/new';
diff --git a/app/templates/management/fleets/index/details.js b/app/templates/management/fleets/index/details.js
index 1f353add..a93b2891 100644
--- a/app/templates/management/fleets/index/details.js
+++ b/app/templates/management/fleets/index/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/management/fleets/index/details';
+export { default } from '@fleetbase/fleetops-engine/templates/management/fleets/index/details';
diff --git a/app/templates/management/vehicles/index/details.js b/app/templates/management/vehicles/index/details.js
index 3f0f4e78..fe3d0f7c 100644
--- a/app/templates/management/vehicles/index/details.js
+++ b/app/templates/management/vehicles/index/details.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/management/vehicles/index/details';
+export { default } from '@fleetbase/fleetops-engine/templates/management/vehicles/index/details';
diff --git a/app/templates/management/vehicles/index/edit.js b/app/templates/management/vehicles/index/edit.js
index c9e5fe3b..88157680 100644
--- a/app/templates/management/vehicles/index/edit.js
+++ b/app/templates/management/vehicles/index/edit.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/management/vehicles/index/edit';
+export { default } from '@fleetbase/fleetops-engine/templates/management/vehicles/index/edit';
diff --git a/app/templates/management/vehicles/index/new.js b/app/templates/management/vehicles/index/new.js
index 53aafb3d..71efee2c 100644
--- a/app/templates/management/vehicles/index/new.js
+++ b/app/templates/management/vehicles/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/management/vehicles/index/new';
+export { default } from '@fleetbase/fleetops-engine/templates/management/vehicles/index/new';
diff --git a/app/templates/operations/orders/index/config.js b/app/templates/operations/orders/index/config.js
index 78c9853e..0a893801 100644
--- a/app/templates/operations/orders/index/config.js
+++ b/app/templates/operations/orders/index/config.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/operations/orders/index/config';
+export { default } from '@fleetbase/fleetops-engine/templates/operations/orders/index/config';
diff --git a/app/templates/operations/orders/index/config/types.js b/app/templates/operations/orders/index/config/types.js
index 1ac1495c..51781966 100644
--- a/app/templates/operations/orders/index/config/types.js
+++ b/app/templates/operations/orders/index/config/types.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/operations/orders/index/config/types';
+export { default } from '@fleetbase/fleetops-engine/templates/operations/orders/index/config/types';
diff --git a/app/templates/operations/orders/index/new.js b/app/templates/operations/orders/index/new.js
index edd675d6..16242147 100644
--- a/app/templates/operations/orders/index/new.js
+++ b/app/templates/operations/orders/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/operations/orders/index/new';
+export { default } from '@fleetbase/fleetops-engine/templates/operations/orders/index/new';
diff --git a/app/templates/operations/orders/index/view.js b/app/templates/operations/orders/index/view.js
index 10f50f52..273daf6c 100644
--- a/app/templates/operations/orders/index/view.js
+++ b/app/templates/operations/orders/index/view.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/operations/orders/index/view';
+export { default } from '@fleetbase/fleetops-engine/templates/operations/orders/index/view';
diff --git a/app/templates/operations/scheduler.js b/app/templates/operations/scheduler.js
index bfaf93ff..1f7405b6 100644
--- a/app/templates/operations/scheduler.js
+++ b/app/templates/operations/scheduler.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/operations/scheduler';
+export { default } from '@fleetbase/fleetops-engine/templates/operations/scheduler';
diff --git a/app/templates/operations/scheduler/index.js b/app/templates/operations/scheduler/index.js
index b634cbc3..e962477c 100644
--- a/app/templates/operations/scheduler/index.js
+++ b/app/templates/operations/scheduler/index.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/operations/scheduler/index';
+export { default } from '@fleetbase/fleetops-engine/templates/operations/scheduler/index';
diff --git a/app/templates/operations/service-rates/index/edit.js b/app/templates/operations/service-rates/index/edit.js
index 88688dd1..122f71db 100644
--- a/app/templates/operations/service-rates/index/edit.js
+++ b/app/templates/operations/service-rates/index/edit.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/operations/service-rates/index/edit';
+export { default } from '@fleetbase/fleetops-engine/templates/operations/service-rates/index/edit';
diff --git a/app/templates/operations/service-rates/index/new.js b/app/templates/operations/service-rates/index/new.js
index 2e1c0e62..516cf782 100644
--- a/app/templates/operations/service-rates/index/new.js
+++ b/app/templates/operations/service-rates/index/new.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/operations/service-rates/index/new';
+export { default } from '@fleetbase/fleetops-engine/templates/operations/service-rates/index/new';
diff --git a/app/templates/virtual.js b/app/templates/virtual.js
index 1f385801..7cbbf6d1 100644
--- a/app/templates/virtual.js
+++ b/app/templates/virtual.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/templates/virtual';
+export { default } from '@fleetbase/fleetops-engine/templates/virtual';
diff --git a/app/utils/calculate-percentage.js b/app/utils/calculate-percentage.js
index 477d4786..ea45f9b0 100644
--- a/app/utils/calculate-percentage.js
+++ b/app/utils/calculate-percentage.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/utils/calculate-percentage';
+export { default } from '@fleetbase/fleetops-engine/utils/calculate-percentage';
diff --git a/app/utils/extract-coordinates.js b/app/utils/extract-coordinates.js
index 2b59c310..cfbdb1a1 100644
--- a/app/utils/extract-coordinates.js
+++ b/app/utils/extract-coordinates.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/utils/extract-coordinates';
+export { default } from '@fleetbase/fleetops-engine/utils/extract-coordinates';
diff --git a/app/utils/format-currency.js b/app/utils/format-currency.js
index f7892d71..fdac33fb 100644
--- a/app/utils/format-currency.js
+++ b/app/utils/format-currency.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/utils/format-currency';
+export { default } from '@fleetbase/fleetops-engine/utils/format-currency';
diff --git a/app/utils/geojson/geo-json.js b/app/utils/geojson/geo-json.js
index b4edf49b..14b2b22e 100644
--- a/app/utils/geojson/geo-json.js
+++ b/app/utils/geojson/geo-json.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/utils/geojson/geo-json';
+export { default } from '@fleetbase/fleetops-engine/utils/geojson/geo-json';
diff --git a/app/utils/is-facilitator-supported-place.js b/app/utils/is-facilitator-supported-place.js
index 01d5641d..c1bb8f5e 100644
--- a/app/utils/is-facilitator-supported-place.js
+++ b/app/utils/is-facilitator-supported-place.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/utils/is-facilitator-supported-place';
+export { default } from '@fleetbase/fleetops-engine/utils/is-facilitator-supported-place';
diff --git a/app/utils/is-latitude.js b/app/utils/is-latitude.js
index 3efde1af..091da4c5 100644
--- a/app/utils/is-latitude.js
+++ b/app/utils/is-latitude.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/utils/is-latitude';
+export { default } from '@fleetbase/fleetops-engine/utils/is-latitude';
diff --git a/app/utils/to-model.js b/app/utils/to-model.js
index 82e08249..c8ae8878 100644
--- a/app/utils/to-model.js
+++ b/app/utils/to-model.js
@@ -1 +1 @@
-export { default } from '@fleetbase/fleetops/utils/to-model';
+export { default } from '@fleetbase/fleetops-engine/utils/to-model';
diff --git a/server/src/Http/Resources/v1/Fleet.php b/server/src/Http/Resources/v1/Fleet.php
index 382ad057..0e5c82d6 100644
--- a/server/src/Http/Resources/v1/Fleet.php
+++ b/server/src/Http/Resources/v1/Fleet.php
@@ -30,7 +30,7 @@ public function toArray($request)
                 'service_area'         => $this->whenLoaded('serviceArea', new ServiceArea($this->serviceArea)),
                 'zone'                 => $this->whenLoaded('zone', new Zone($this->zone)),
                 'vendor'               => $this->whenLoaded('vendor', new Vendor($this->vendor)),
-                'parent_fleet'         => $this->whenLoaded('parent_fleet', new self($this->parent_fleet)),
+                'parentFleet'          => $this->whenLoaded('parent_fleet', new self($this->parent_fleet)),
                 'drivers'              => $this->whenLoaded('drivers', Driver::collection($this->drivers()->without(['driverAssigned'])->with(Http::isInternalRequest() ? ['jobs'] : [])->get())),
                 'vehicles'             => $this->whenLoaded('vehicles', Vehicle::collection($this->vehicles)),
                 'updated_at'           => $this->updated_at,