diff --git a/src/views/Control/ServerLed/ServerLed.vue b/src/views/Control/ServerLed/ServerLed.vue
deleted file mode 100644
index 72726ba..0000000
--- a/src/views/Control/ServerLed/ServerLed.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <b-container fluid="xl">
-    <page-title />
-    <b-row>
-      <b-col md="12">
-        <page-section :section-title="$t('pageServerLed.serverLedTitle')">
-          <b-form-group :label="$t('pageServerLed.serverLedSubTitle')">
-            <b-form-checkbox
-              v-model="indicatorLedActiveState"
-              data-test-id="serverLed-checkbox-switchIndicatorLed"
-              name="check-button"
-              switch
-              @change="changeLedValue"
-            >
-              <span v-if="indicatorLedActiveState">
-                {{ $t('global.status.on') }}
-              </span>
-              <span v-else>
-                {{ $t('global.status.off') }}
-              </span>
-            </b-form-checkbox>
-          </b-form-group>
-        </page-section>
-      </b-col>
-    </b-row>
-  </b-container>
-</template>
-
-<script>
-import PageTitle from '@/components/Global/PageTitle';
-import PageSection from '@/components/Global/PageSection';
-import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-
-export default {
-  name: 'ServerLed',
-  components: { PageTitle, PageSection },
-  mixins: [LoadingBarMixin, BVToastMixin],
-  beforeRouteLeave(to, from, next) {
-    this.hideLoader();
-    next();
-  },
-  computed: {
-    indicatorLedActiveState: {
-      get() {
-        return this.$store.getters['serverLed/getIndicatorLedActiveState'];
-      },
-      set(newValue) {
-        return newValue;
-      },
-    },
-  },
-  created() {
-    this.startLoader();
-    this.$store
-      .dispatch('serverLed/getIndicatorLedActiveState')
-      .finally(() => this.endLoader());
-  },
-  methods: {
-    changeLedValue(indicatorLedActiveState) {
-      this.$store
-        .dispatch(
-          'serverLed/saveIndicatorLedActiveState',
-          indicatorLedActiveState
-        )
-        .then((message) => this.successToast(message))
-        .catch(({ message }) => this.errorToast(message));
-    },
-  },
-};
-</script>
diff --git a/src/views/Control/ServerLed/index.js b/src/views/Control/ServerLed/index.js
deleted file mode 100644
index 1926dae..0000000
--- a/src/views/Control/ServerLed/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import ServerLed from './ServerLed.vue';
-export default ServerLed;
diff --git a/src/views/Control/FactoryReset/FactoryReset.vue b/src/views/Operations/FactoryReset/FactoryReset.vue
similarity index 100%
rename from src/views/Control/FactoryReset/FactoryReset.vue
rename to src/views/Operations/FactoryReset/FactoryReset.vue
diff --git a/src/views/Control/FactoryReset/FactoryResetModal.vue b/src/views/Operations/FactoryReset/FactoryResetModal.vue
similarity index 100%
rename from src/views/Control/FactoryReset/FactoryResetModal.vue
rename to src/views/Operations/FactoryReset/FactoryResetModal.vue
diff --git a/src/views/Control/FactoryReset/index.js b/src/views/Operations/FactoryReset/index.js
similarity index 100%
rename from src/views/Control/FactoryReset/index.js
rename to src/views/Operations/FactoryReset/index.js
diff --git a/src/views/Configuration/Firmware/Firmware.vue b/src/views/Operations/Firmware/Firmware.vue
similarity index 100%
rename from src/views/Configuration/Firmware/Firmware.vue
rename to src/views/Operations/Firmware/Firmware.vue
diff --git a/src/views/Configuration/Firmware/FirmwareAlertServerPower.vue b/src/views/Operations/Firmware/FirmwareAlertServerPower.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareAlertServerPower.vue
rename to src/views/Operations/Firmware/FirmwareAlertServerPower.vue
diff --git a/src/views/Configuration/Firmware/FirmwareCardsBmc.vue b/src/views/Operations/Firmware/FirmwareCardsBmc.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareCardsBmc.vue
rename to src/views/Operations/Firmware/FirmwareCardsBmc.vue
diff --git a/src/views/Configuration/Firmware/FirmwareCardsHost.vue b/src/views/Operations/Firmware/FirmwareCardsHost.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareCardsHost.vue
rename to src/views/Operations/Firmware/FirmwareCardsHost.vue
diff --git a/src/views/Configuration/Firmware/FirmwareFormUpdate.vue b/src/views/Operations/Firmware/FirmwareFormUpdate.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareFormUpdate.vue
rename to src/views/Operations/Firmware/FirmwareFormUpdate.vue
diff --git a/src/views/Configuration/Firmware/FirmwareModalSwitchToRunning.vue b/src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareModalSwitchToRunning.vue
rename to src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue
diff --git a/src/views/Configuration/Firmware/FirmwareModalUpdateFirmware.vue b/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue
similarity index 100%
rename from src/views/Configuration/Firmware/FirmwareModalUpdateFirmware.vue
rename to src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue
diff --git a/src/views/Configuration/Firmware/index.js b/src/views/Operations/Firmware/index.js
similarity index 100%
rename from src/views/Configuration/Firmware/index.js
rename to src/views/Operations/Firmware/index.js
diff --git a/src/views/Control/Kvm/Kvm.vue b/src/views/Operations/Kvm/Kvm.vue
similarity index 100%
rename from src/views/Control/Kvm/Kvm.vue
rename to src/views/Operations/Kvm/Kvm.vue
diff --git a/src/views/Control/Kvm/KvmConsole.vue b/src/views/Operations/Kvm/KvmConsole.vue
similarity index 100%
rename from src/views/Control/Kvm/KvmConsole.vue
rename to src/views/Operations/Kvm/KvmConsole.vue
diff --git a/src/views/Control/Kvm/index.js b/src/views/Operations/Kvm/index.js
similarity index 100%
rename from src/views/Control/Kvm/index.js
rename to src/views/Operations/Kvm/index.js
diff --git a/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue b/src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue
similarity index 100%
rename from src/views/Control/ManagePowerUsage/ManagePowerUsage.vue
rename to src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue
diff --git a/src/views/Control/ManagePowerUsage/index.js b/src/views/Operations/ManagePowerUsage/index.js
similarity index 100%
rename from src/views/Control/ManagePowerUsage/index.js
rename to src/views/Operations/ManagePowerUsage/index.js
diff --git a/src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue b/src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue
similarity index 100%
rename from src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue
rename to src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue
diff --git a/src/views/Control/PowerRestorePolicy/index.js b/src/views/Operations/PowerRestorePolicy/index.js
similarity index 100%
rename from src/views/Control/PowerRestorePolicy/index.js
rename to src/views/Operations/PowerRestorePolicy/index.js
diff --git a/src/views/Control/RebootBmc/RebootBmc.vue b/src/views/Operations/RebootBmc/RebootBmc.vue
similarity index 100%
rename from src/views/Control/RebootBmc/RebootBmc.vue
rename to src/views/Operations/RebootBmc/RebootBmc.vue
diff --git a/src/views/Control/RebootBmc/index.js b/src/views/Operations/RebootBmc/index.js
similarity index 100%
rename from src/views/Control/RebootBmc/index.js
rename to src/views/Operations/RebootBmc/index.js
diff --git a/src/views/Control/SerialOverLan/SerialOverLan.vue b/src/views/Operations/SerialOverLan/SerialOverLan.vue
similarity index 100%
rename from src/views/Control/SerialOverLan/SerialOverLan.vue
rename to src/views/Operations/SerialOverLan/SerialOverLan.vue
diff --git a/src/views/Control/SerialOverLan/SerialOverLanConsole.vue b/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue
similarity index 100%
rename from src/views/Control/SerialOverLan/SerialOverLanConsole.vue
rename to src/views/Operations/SerialOverLan/SerialOverLanConsole.vue
diff --git a/src/views/Control/SerialOverLan/index.js b/src/views/Operations/SerialOverLan/index.js
similarity index 100%
rename from src/views/Control/SerialOverLan/index.js
rename to src/views/Operations/SerialOverLan/index.js
diff --git a/src/views/Control/ServerPowerOperations/BootSettings.vue b/src/views/Operations/ServerPowerOperations/BootSettings.vue
similarity index 100%
rename from src/views/Control/ServerPowerOperations/BootSettings.vue
rename to src/views/Operations/ServerPowerOperations/BootSettings.vue
diff --git a/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
similarity index 100%
rename from src/views/Control/ServerPowerOperations/ServerPowerOperations.vue
rename to src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
diff --git a/src/views/Control/ServerPowerOperations/index.js b/src/views/Operations/ServerPowerOperations/index.js
similarity index 100%
rename from src/views/Control/ServerPowerOperations/index.js
rename to src/views/Operations/ServerPowerOperations/index.js
diff --git a/src/views/Control/VirtualMedia/ModalConfigureConnection.vue b/src/views/Operations/VirtualMedia/ModalConfigureConnection.vue
similarity index 100%
rename from src/views/Control/VirtualMedia/ModalConfigureConnection.vue
rename to src/views/Operations/VirtualMedia/ModalConfigureConnection.vue
diff --git a/src/views/Control/VirtualMedia/VirtualMedia.vue b/src/views/Operations/VirtualMedia/VirtualMedia.vue
similarity index 100%
rename from src/views/Control/VirtualMedia/VirtualMedia.vue
rename to src/views/Operations/VirtualMedia/VirtualMedia.vue
diff --git a/src/views/Control/VirtualMedia/index.js b/src/views/Operations/VirtualMedia/index.js
similarity index 100%
rename from src/views/Control/VirtualMedia/index.js
rename to src/views/Operations/VirtualMedia/index.js
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index 7e2602e..9392c56 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -41,7 +41,7 @@
     </div>
     <div>
       <b-button
-        to="/control/serial-over-lan"
+        to="/operations/serial-over-lan"
         variant="secondary"
         data-test-id="overviewQuickLinks-button-solConsole"
         class="d-flex justify-content-between align-items-center"
@@ -91,7 +91,6 @@
           'serverLed/saveIndicatorLedActiveState',
           indicatorLedActiveState
         )
-        .then((message) => this.successToast(message))
         .catch(({ message }) => this.errorToast(message));
     },
   },