diff --git a/src/store/index.js b/src/store/index.js
index 3ea4c5a..fcfac59 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -7,11 +7,11 @@
 import LdapStore from './modules/AccessControl/LdapStore';
 import LocalUserManagementStore from './modules/AccessControl/LocalUserMangementStore';
 import SslCertificatesStore from './modules/AccessControl/SslCertificatesStore';
-import FirmwareStore from './modules/Configuration/FirmwareStore';
-import BootSettingsStore from './modules/Control/BootSettingsStore';
-import ControlStore from './modules/Control/ControlStore';
-import PowerControlStore from './modules/Control/PowerControlStore';
-import PowerPolicyStore from './modules/Control/PowerPolicyStore';
+import FirmwareStore from './modules/Operations/FirmwareStore';
+import BootSettingsStore from './modules/Operations/BootSettingsStore';
+import ControlStore from './modules/Operations/ControlStore';
+import PowerControlStore from './modules/Operations/PowerControlStore';
+import PowerPolicyStore from './modules/Operations/PowerPolicyStore';
 import NetworkSettingStore from './modules/Configuration/NetworkSettingsStore';
 import EventLogStore from './modules/Logs/EventLogStore';
 import SensorsStore from './modules/HardwareStatus/SensorsStore';
@@ -25,11 +25,11 @@
 import ProcessorStore from './modules/HardwareStatus/ProcessorStore';
 import PostCodeLogsStore from './modules/Logs/PostCodeLogsStore';
 import SecuritySettingsStore from './modules/Configuration/SecuritySettingsStore';
-import FactoryResetStore from './modules/Control/FactoryResetStore';
+import FactoryResetStore from './modules/Operations/FactoryResetStore';
 
 import WebSocketPlugin from './plugins/WebSocketPlugin';
 import DateTimeStore from './modules/Configuration/DateTimeSettingsStore';
-import VirtualMediaStore from './modules/Control/VirtualMediaStore';
+import VirtualMediaStore from './modules/Operations/VirtualMediaStore';
 
 Vue.use(Vuex);
 
diff --git a/src/store/modules/HardwareStatus/ServerLedStore.js b/src/store/modules/HardwareStatus/ServerLedStore.js
index a8903e2..028a6f7 100644
--- a/src/store/modules/HardwareStatus/ServerLedStore.js
+++ b/src/store/modules/HardwareStatus/ServerLedStore.js
@@ -32,20 +32,17 @@
         .patch('/redfish/v1/Systems/system', {
           LocationIndicatorActive: payload,
         })
-        .then(() => {
-          if (payload) {
-            return i18n.t('pageServerLed.toast.successServerLedOn');
-          } else {
-            return i18n.t('pageServerLed.toast.successServerLedOff');
-          }
-        })
         .catch((error) => {
           console.log(error);
           commit('setIndicatorLedActiveState', !payload);
           if (payload) {
-            throw new Error(i18n.t('pageServerLed.toast.errorServerLedOn'));
+            throw new Error(
+              i18n.t('pageInventory.toast.errorEnableIdentifyLed')
+            );
           } else {
-            throw new Error(i18n.t('pageServerLed.toast.errorServerLedOff'));
+            throw new Error(
+              i18n.t('pageInventory.toast.errorDisableIdentifyLed')
+            );
           }
         });
     },
diff --git a/src/store/modules/Control/BootSettingsStore.js b/src/store/modules/Operations/BootSettingsStore.js
similarity index 100%
rename from src/store/modules/Control/BootSettingsStore.js
rename to src/store/modules/Operations/BootSettingsStore.js
diff --git a/src/store/modules/Control/ControlStore.js b/src/store/modules/Operations/ControlStore.js
similarity index 100%
rename from src/store/modules/Control/ControlStore.js
rename to src/store/modules/Operations/ControlStore.js
diff --git a/src/store/modules/Control/FactoryResetStore.js b/src/store/modules/Operations/FactoryResetStore.js
similarity index 100%
rename from src/store/modules/Control/FactoryResetStore.js
rename to src/store/modules/Operations/FactoryResetStore.js
diff --git a/src/store/modules/Configuration/FirmwareStore.js b/src/store/modules/Operations/FirmwareStore.js
similarity index 100%
rename from src/store/modules/Configuration/FirmwareStore.js
rename to src/store/modules/Operations/FirmwareStore.js
diff --git a/src/store/modules/Control/PowerControlStore.js b/src/store/modules/Operations/PowerControlStore.js
similarity index 100%
rename from src/store/modules/Control/PowerControlStore.js
rename to src/store/modules/Operations/PowerControlStore.js
diff --git a/src/store/modules/Control/PowerPolicyStore.js b/src/store/modules/Operations/PowerPolicyStore.js
similarity index 100%
rename from src/store/modules/Control/PowerPolicyStore.js
rename to src/store/modules/Operations/PowerPolicyStore.js
diff --git a/src/store/modules/Control/VirtualMediaStore.js b/src/store/modules/Operations/VirtualMediaStore.js
similarity index 100%
rename from src/store/modules/Control/VirtualMediaStore.js
rename to src/store/modules/Operations/VirtualMediaStore.js