diff --git a/src/common/front-end-routing/routes/cluster/config/vertical-pod-autoscalers/navigate-to-vertical-pod-autoscalers.injectable.ts b/packages/core/src/common/front-end-routing/routes/cluster/config/vertical-pod-autoscalers/navigate-to-vertical-pod-autoscalers.injectable.ts
similarity index 100%
rename from src/common/front-end-routing/routes/cluster/config/vertical-pod-autoscalers/navigate-to-vertical-pod-autoscalers.injectable.ts
rename to packages/core/src/common/front-end-routing/routes/cluster/config/vertical-pod-autoscalers/navigate-to-vertical-pod-autoscalers.injectable.ts
diff --git a/src/common/front-end-routing/routes/cluster/config/vertical-pod-autoscalers/vertical-pod-autoscalers-route.injectable.ts b/packages/core/src/common/front-end-routing/routes/cluster/config/vertical-pod-autoscalers/vertical-pod-autoscalers-route.injectable.ts
similarity index 100%
rename from src/common/front-end-routing/routes/cluster/config/vertical-pod-autoscalers/vertical-pod-autoscalers-route.injectable.ts
rename to packages/core/src/common/front-end-routing/routes/cluster/config/vertical-pod-autoscalers/vertical-pod-autoscalers-route.injectable.ts
diff --git a/packages/core/src/renderer/components/+config-autoscalers/__snapshots__/hpa-details.test.tsx.snap b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/__snapshots__/hpa-details.test.tsx.snap
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/__snapshots__/hpa-details.test.tsx.snap
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/__snapshots__/hpa-details.test.tsx.snap
diff --git a/packages/core/src/renderer/components/+config-autoscalers/autoscaler.mixins.scss b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/autoscaler.mixins.scss
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/autoscaler.mixins.scss
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/autoscaler.mixins.scss
diff --git a/packages/core/src/renderer/components/+config-autoscalers/get-hpa-metric-name.ts b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/get-hpa-metric-name.ts
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/get-hpa-metric-name.ts
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/get-hpa-metric-name.ts
diff --git a/packages/core/src/renderer/components/+config-autoscalers/get-hpa-metrics.injectable.ts b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/get-hpa-metrics.injectable.ts
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/get-hpa-metrics.injectable.ts
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/get-hpa-metrics.injectable.ts
diff --git a/packages/core/src/renderer/components/+config-autoscalers/horizontal-pod-auto-scalers-sidebar-items.injectable.tsx b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/horizontal-pod-auto-scalers-sidebar-items.injectable.tsx
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/horizontal-pod-auto-scalers-sidebar-items.injectable.tsx
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/horizontal-pod-auto-scalers-sidebar-items.injectable.tsx
diff --git a/packages/core/src/renderer/components/+config-autoscalers/horizontal-pod-autoscaler-metrics.test.ts b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/horizontal-pod-autoscaler-metrics.test.ts
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/horizontal-pod-autoscaler-metrics.test.ts
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/horizontal-pod-autoscaler-metrics.test.ts
diff --git a/packages/core/src/renderer/components/+config-autoscalers/horizontal-pod-autoscalers-route-component.injectable.ts b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/horizontal-pod-autoscalers-route-component.injectable.ts
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/horizontal-pod-autoscalers-route-component.injectable.ts
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/horizontal-pod-autoscalers-route-component.injectable.ts
diff --git a/packages/core/src/renderer/components/+config-autoscalers/hpa-details.scss b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.scss
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/hpa-details.scss
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.scss
diff --git a/packages/core/src/renderer/components/+config-autoscalers/hpa-details.test.tsx b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/hpa-details.test.tsx
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx
diff --git a/packages/core/src/renderer/components/+config-autoscalers/hpa-details.tsx b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.tsx
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/hpa-details.tsx
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.tsx
diff --git a/packages/core/src/renderer/components/+config-autoscalers/hpa-v1-metric-parser.ts b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-v1-metric-parser.ts
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/hpa-v1-metric-parser.ts
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-v1-metric-parser.ts
diff --git a/packages/core/src/renderer/components/+config-autoscalers/hpa-v2-metric-parser.ts b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-v2-metric-parser.ts
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/hpa-v2-metric-parser.ts
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-v2-metric-parser.ts
diff --git a/packages/core/src/renderer/components/+config-autoscalers/hpa.scss b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa.scss
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/hpa.scss
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa.scss
diff --git a/packages/core/src/renderer/components/+config-autoscalers/hpa.tsx b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa.tsx
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/hpa.tsx
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa.tsx
diff --git a/packages/core/src/renderer/components/+config-autoscalers/index.ts b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/index.ts
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/index.ts
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/index.ts
diff --git a/packages/core/src/renderer/components/+config-autoscalers/store.injectable.ts b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/store.injectable.ts
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/store.injectable.ts
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/store.injectable.ts
diff --git a/packages/core/src/renderer/components/+config-autoscalers/store.ts b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/store.ts
similarity index 100%
rename from packages/core/src/renderer/components/+config-autoscalers/store.ts
rename to packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/store.ts
diff --git a/src/renderer/components/+config-vertical-pod-autoscalers/autoscaler.mixins.scss b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/autoscaler.mixins.scss
similarity index 100%
rename from src/renderer/components/+config-vertical-pod-autoscalers/autoscaler.mixins.scss
rename to packages/core/src/renderer/components/+config-vertical-pod-autoscalers/autoscaler.mixins.scss
diff --git a/src/renderer/components/+config-vertical-pod-autoscalers/index.ts b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/index.ts
similarity index 100%
rename from src/renderer/components/+config-vertical-pod-autoscalers/index.ts
rename to packages/core/src/renderer/components/+config-vertical-pod-autoscalers/index.ts
diff --git a/src/renderer/components/+config-vertical-pod-autoscalers/store.injectable.ts b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/store.injectable.ts
similarity index 100%
rename from src/renderer/components/+config-vertical-pod-autoscalers/store.injectable.ts
rename to packages/core/src/renderer/components/+config-vertical-pod-autoscalers/store.injectable.ts
diff --git a/src/renderer/components/+config-vertical-pod-autoscalers/store.ts b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/store.ts
similarity index 100%
rename from src/renderer/components/+config-vertical-pod-autoscalers/store.ts
rename to packages/core/src/renderer/components/+config-vertical-pod-autoscalers/store.ts
diff --git a/src/renderer/components/+config-vertical-pod-autoscalers/vertical-pod-auto-scalers-sidebar-items.injectable.tsx b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vertical-pod-auto-scalers-sidebar-items.injectable.tsx
similarity index 100%
rename from src/renderer/components/+config-vertical-pod-autoscalers/vertical-pod-auto-scalers-sidebar-items.injectable.tsx
rename to packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vertical-pod-auto-scalers-sidebar-items.injectable.tsx
diff --git a/src/renderer/components/+config-vertical-pod-autoscalers/vertical-pod-autoscalers-route-component.injectable.ts b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vertical-pod-autoscalers-route-component.injectable.ts
similarity index 100%
rename from src/renderer/components/+config-vertical-pod-autoscalers/vertical-pod-autoscalers-route-component.injectable.ts
rename to packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vertical-pod-autoscalers-route-component.injectable.ts
diff --git a/src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.scss b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.scss
similarity index 100%
rename from src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.scss
rename to packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.scss
diff --git a/src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.tsx b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.tsx
similarity index 100%
rename from src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.tsx
rename to packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa-details.tsx
diff --git a/src/renderer/components/+config-vertical-pod-autoscalers/vpa.scss b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa.scss
similarity index 100%
rename from src/renderer/components/+config-vertical-pod-autoscalers/vpa.scss
rename to packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa.scss
diff --git a/src/renderer/components/+config-vertical-pod-autoscalers/vpa.tsx b/packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa.tsx
similarity index 100%
rename from src/renderer/components/+config-vertical-pod-autoscalers/vpa.tsx
rename to packages/core/src/renderer/components/+config-vertical-pod-autoscalers/vpa.tsx