diff --git a/src/views/Configuration/DateTimeSettings/index.js b/src/views/Configuration/DateTimeSettings/index.js
deleted file mode 100644
index c8b5c08..0000000
--- a/src/views/Configuration/DateTimeSettings/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import DateTimeSettings from './DateTimeSettings.vue';
-export default DateTimeSettings;
diff --git a/src/views/Configuration/NetworkSettings/index.js b/src/views/Configuration/NetworkSettings/index.js
deleted file mode 100644
index 1215e1c..0000000
--- a/src/views/Configuration/NetworkSettings/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import NetworkSettings from './NetworkSettings.vue';
-export default NetworkSettings;
diff --git a/src/views/Overview/OverviewNetwork.vue b/src/views/Overview/OverviewNetwork.vue
index 8caf1e8..bfb378a 100644
--- a/src/views/Overview/OverviewNetwork.vue
+++ b/src/views/Overview/OverviewNetwork.vue
@@ -45,11 +45,11 @@
   name: 'Network',
   computed: {
     ethernetData() {
-      return this.$store.getters['networkSettings/ethernetData'];
+      return this.$store.getters['network/ethernetData'];
     },
   },
   created() {
-    this.$store.dispatch('networkSettings/getEthernetData').finally(() => {
+    this.$store.dispatch('network/getEthernetData').finally(() => {
       this.$root.$emit('overview-network-complete');
     });
   },
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index 9392c56..1dc2c98 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -30,7 +30,7 @@
     </div>
     <div>
       <b-button
-        to="/configuration/network-settings"
+        to="/settings/network"
         variant="secondary"
         data-test-id="overviewQuickLinks-button-networkSettings"
         class="d-flex justify-content-between align-items-center"
diff --git a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue b/src/views/Settings/DateTime/DateTime.vue
similarity index 88%
rename from src/views/Configuration/DateTimeSettings/DateTimeSettings.vue
rename to src/views/Settings/DateTime/DateTime.vue
index 613953f..e62e344 100644
--- a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue
+++ b/src/views/Settings/DateTime/DateTime.vue
@@ -5,9 +5,9 @@
       <b-col md="8" xl="6">
         <alert variant="info" class="mb-4">
           <span>
-            {{ $t('pageDateTimeSettings.alert.message') }}
+            {{ $t('pageDateTime.alert.message') }}
             <b-link to="/profile-settings">
-              {{ $t('pageDateTimeSettings.alert.link') }}</b-link
+              {{ $t('pageDateTime.alert.link') }}</b-link
             >
           </span>
         </alert>
@@ -17,21 +17,21 @@
       <b-row>
         <b-col lg="3">
           <dl>
-            <dt>{{ $t('pageDateTimeSettings.form.date') }}</dt>
+            <dt>{{ $t('pageDateTime.form.date') }}</dt>
             <dd v-if="bmcTime">{{ bmcTime | formatDate }}</dd>
             <dd v-else>--</dd>
           </dl>
         </b-col>
         <b-col lg="3">
           <dl>
-            <dt>{{ $t('pageDateTimeSettings.form.time.label') }}</dt>
+            <dt>{{ $t('pageDateTime.form.time.label') }}</dt>
             <dd v-if="bmcTime">{{ bmcTime | formatTime }}</dd>
             <dd v-else>--</dd>
           </dl>
         </b-col>
       </b-row>
     </page-section>
-    <page-section :section-title="$t('pageDateTimeSettings.configureSettings')">
+    <page-section :section-title="$t('pageDateTime.configureSettings')">
       <b-form novalidate @submit.prevent="submitForm">
         <b-form-group
           label="Configure date and time"
@@ -41,14 +41,14 @@
           <b-form-radio
             v-model="form.configurationSelected"
             value="manual"
-            data-test-id="dateTimeSettings-radio-configureManual"
+            data-test-id="dateTime-radio-configureManual"
           >
-            {{ $t('pageDateTimeSettings.form.manual') }}
+            {{ $t('pageDateTime.form.manual') }}
           </b-form-radio>
           <b-row class="mt-3 ml-3">
             <b-col sm="6" lg="4" xl="3">
               <b-form-group
-                :label="$t('pageDateTimeSettings.form.date')"
+                :label="$t('pageDateTime.form.date')"
                 label-for="input-manual-date"
               >
                 <b-form-text id="date-format-help">YYYY-MM-DD</b-form-text>
@@ -58,7 +58,7 @@
                     v-model="form.manual.date"
                     :state="getValidationState($v.form.manual.date)"
                     :disabled="ntpOptionSelected"
-                    data-test-id="dateTimeSettings-input-manualDate"
+                    data-test-id="dateTime-input-manualDate"
                     class="form-control-with-button"
                     @blur="$v.form.manual.date.$touch()"
                   />
@@ -97,9 +97,7 @@
             </b-col>
             <b-col sm="6" lg="4" xl="3">
               <b-form-group
-                :label="
-                  $t('pageDateTimeSettings.form.time.timezone', { timezone })
-                "
+                :label="$t('pageDateTime.form.time.timezone', { timezone })"
                 label-for="input-manual-time"
               >
                 <b-form-text id="time-format-help">HH:MM</b-form-text>
@@ -109,7 +107,7 @@
                     v-model="form.manual.time"
                     :state="getValidationState($v.form.manual.time)"
                     :disabled="ntpOptionSelected"
-                    data-test-id="dateTimeSettings-input-manualTime"
+                    data-test-id="dateTime-input-manualTime"
                     @blur="$v.form.manual.time.$touch()"
                   />
                   <b-form-invalid-feedback role="alert">
@@ -127,14 +125,14 @@
           <b-form-radio
             v-model="form.configurationSelected"
             value="ntp"
-            data-test-id="dateTimeSettings-radio-configureNTP"
+            data-test-id="dateTime-radio-configureNTP"
           >
             NTP
           </b-form-radio>
           <b-row class="mt-3 ml-3">
             <b-col sm="6" lg="4" xl="3">
               <b-form-group
-                :label="$t('pageDateTimeSettings.form.ntpServers.server1')"
+                :label="$t('pageDateTime.form.ntpServers.server1')"
                 label-for="input-ntp-1"
               >
                 <b-input-group>
@@ -143,7 +141,7 @@
                     v-model="form.ntp.firstAddress"
                     :state="getValidationState($v.form.ntp.firstAddress)"
                     :disabled="manualOptionSelected"
-                    data-test-id="dateTimeSettings-input-ntpServer1"
+                    data-test-id="dateTime-input-ntpServer1"
                     @blur="$v.form.ntp.firstAddress.$touch()"
                   />
                   <b-form-invalid-feedback role="alert">
@@ -156,7 +154,7 @@
             </b-col>
             <b-col sm="6" lg="4" xl="3">
               <b-form-group
-                :label="$t('pageDateTimeSettings.form.ntpServers.server2')"
+                :label="$t('pageDateTime.form.ntpServers.server2')"
                 label-for="input-ntp-2"
               >
                 <b-input-group>
@@ -164,14 +162,14 @@
                     id="input-ntp-2"
                     v-model="form.ntp.secondAddress"
                     :disabled="manualOptionSelected"
-                    data-test-id="dateTimeSettings-input-ntpServer2"
+                    data-test-id="dateTime-input-ntpServer2"
                   />
                 </b-input-group>
               </b-form-group>
             </b-col>
             <b-col sm="6" lg="4" xl="3">
               <b-form-group
-                :label="$t('pageDateTimeSettings.form.ntpServers.server3')"
+                :label="$t('pageDateTime.form.ntpServers.server3')"
                 label-for="input-ntp-3"
               >
                 <b-input-group>
@@ -179,7 +177,7 @@
                     id="input-ntp-3"
                     v-model="form.ntp.thirdAddress"
                     :disabled="manualOptionSelected"
-                    data-test-id="dateTimeSettings-input-ntpServer3"
+                    data-test-id="dateTime-input-ntpServer3"
                   />
                 </b-input-group>
               </b-form-group>
@@ -188,7 +186,7 @@
           <b-button
             variant="primary"
             type="submit"
-            data-test-id="dateTimeSettings-button-saveSettings"
+            data-test-id="dateTime-button-saveSettings"
           >
             {{ $t('global.action.saveSettings') }}
           </b-button>
@@ -216,7 +214,7 @@
 const isoTimeRegex = /^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/;
 
 export default {
-  name: 'DateTimeSettings',
+  name: 'DateTime',
   components: { Alert, IconCalendar, PageTitle, PageSection },
   mixins: [
     BVToastMixin,
@@ -366,7 +364,7 @@
       }
 
       this.$store
-        .dispatch('dateTime/updateDateTimeSettings', dateTimeForm)
+        .dispatch('dateTime/updateDateTime', dateTimeForm)
         .then((success) => {
           this.successToast(success);
           if (!isNTPEnabled) return;
diff --git a/src/views/Settings/DateTime/index.js b/src/views/Settings/DateTime/index.js
new file mode 100644
index 0000000..2df21ea
--- /dev/null
+++ b/src/views/Settings/DateTime/index.js
@@ -0,0 +1,2 @@
+import DateTime from './DateTime.vue';
+export default DateTime;
diff --git a/src/views/Configuration/NetworkSettings/NetworkSettings.vue b/src/views/Settings/Network/Network.vue
similarity index 85%
rename from src/views/Configuration/NetworkSettings/NetworkSettings.vue
rename to src/views/Settings/Network/Network.vue
index d6da717..ab5003f 100644
--- a/src/views/Configuration/NetworkSettings/NetworkSettings.vue
+++ b/src/views/Settings/Network/Network.vue
@@ -1,18 +1,18 @@
 <template>
   <b-container fluid="xl">
-    <page-title :description="$t('pageNetworkSettings.pageDescription')" />
-    <page-section :section-title="$t('pageNetworkSettings.interface')">
+    <page-title :description="$t('pageNetwork.pageDescription')" />
+    <page-section :section-title="$t('pageNetwork.interface')">
       <b-row>
         <b-col lg="3">
           <b-form-group
             label-for="interface-select"
-            :label="$t('pageNetworkSettings.form.networkInterface')"
+            :label="$t('pageNetwork.form.networkInterface')"
           >
             <b-form-select
               id="interface-select"
               v-model="selectedInterfaceIndex"
               :disabled="loading"
-              data-test-id="networkSettings-select-interface"
+              data-test-id="network-select-interface"
               :options="interfaceSelectOptions"
               @change="selectInterface"
             >
@@ -23,17 +23,17 @@
     </page-section>
     <b-form novalidate @submit.prevent="submitForm">
       <b-form-group :disabled="loading">
-        <page-section :section-title="$t('pageNetworkSettings.system')">
+        <page-section :section-title="$t('pageNetwork.system')">
           <b-row>
             <b-col lg="3">
               <b-form-group
-                :label="$t('pageNetworkSettings.form.defaultGateway')"
+                :label="$t('pageNetwork.form.defaultGateway')"
                 label-for="default-gateway"
               >
                 <b-form-input
                   id="default-gateway"
                   v-model.trim="form.gateway"
-                  data-test-id="networkSettings-input-gateway"
+                  data-test-id="network-input-gateway"
                   type="text"
                   :state="getValidationState($v.form.gateway)"
                   @change="$v.form.gateway.$touch()"
@@ -50,13 +50,13 @@
             </b-col>
             <b-col lg="3">
               <b-form-group
-                :label="$t('pageNetworkSettings.form.hostname')"
+                :label="$t('pageNetwork.form.hostname')"
                 label-for="hostname-field"
               >
                 <b-form-input
                   id="hostname-field"
                   v-model.trim="form.hostname"
-                  data-test-id="networkSettings-input-hostname"
+                  data-test-id="network-input-hostname"
                   type="text"
                   :state="getValidationState($v.form.hostname)"
                   @change="$v.form.hostname.$touch()"
@@ -75,13 +75,13 @@
             </b-col>
             <b-col lg="3">
               <b-form-group
-                :label="$t('pageNetworkSettings.form.macAddress')"
+                :label="$t('pageNetwork.form.macAddress')"
                 label-for="mac-address"
               >
                 <b-form-input
                   id="mac-address"
                   v-model.trim="form.macAddress"
-                  data-test-id="networkSettings-input-macAddress"
+                  data-test-id="network-input-macAddress"
                   type="text"
                   :state="getValidationState($v.form.macAddress)"
                   @change="$v.form.macAddress.$touch()"
@@ -98,10 +98,10 @@
             </b-col>
           </b-row>
         </page-section>
-        <page-section :section-title="$t('pageNetworkSettings.ipv4')">
-          <b-form-group :label="$t('pageNetworkSettings.ipv4Configuration')">
+        <page-section :section-title="$t('pageNetwork.ipv4')">
+          <b-form-group :label="$t('pageNetwork.ipv4Configuration')">
             <b-form-text id="enable-secure-help-block">
-              {{ $t('pageNetworkSettings.ipv4Helper') }}
+              {{ $t('pageNetwork.ipv4Helper') }}
             </b-form-text>
             <b-form-radio
               v-model="form.dhcpEnabled"
@@ -109,7 +109,7 @@
               :value="true"
               @change="onChangeIpv4Config"
             >
-              {{ $t('pageNetworkSettings.dhcp') }}
+              {{ $t('pageNetwork.dhcp') }}
             </b-form-radio>
             <b-form-radio
               v-model="form.dhcpEnabled"
@@ -117,13 +117,13 @@
               :value="false"
               @change="onChangeIpv4Config"
             >
-              {{ $t('pageNetworkSettings.static') }}
+              {{ $t('pageNetwork.static') }}
             </b-form-radio>
           </b-form-group>
           <b-row>
             <b-col lg="9" class="mb-3">
               <h3 class="h4">
-                {{ $t('pageNetworkSettings.dhcp') }}
+                {{ $t('pageNetwork.dhcp') }}
               </h3>
               <b-table
                 responsive="md"
@@ -137,9 +137,9 @@
                 <template #cell(Address)="{ item, index }">
                   <b-form-input
                     v-model.trim="item.Address"
-                    :data-test-id="`networkSettings-input-dhcpIpv4-${index}`"
+                    :data-test-id="`network-input-dhcpIpv4-${index}`"
                     :aria-label="
-                      $t('pageNetworkSettings.table.dhcpIpv4AddressRow') +
+                      $t('pageNetwork.table.dhcpIpv4AddressRow') +
                       ' ' +
                       (index + 1)
                     "
@@ -149,9 +149,9 @@
                 <template #cell(SubnetMask)="{ item, index }">
                   <b-form-input
                     v-model.trim="item.SubnetMask"
-                    :data-test-id="`networkSettings-input-subnetMask-${index}`"
+                    :data-test-id="`network-input-subnetMask-${index}`"
                     :aria-label="
-                      $t('pageNetworkSettings.table.dhcpIpv4SubnetRow') +
+                      $t('pageNetwork.table.dhcpIpv4SubnetRow') +
                       ' ' +
                       (index + 1)
                     "
@@ -178,7 +178,7 @@
             </b-col>
             <b-col lg="9" class="mb-3">
               <h3 class="h4">
-                {{ $t('pageNetworkSettings.static') }}
+                {{ $t('pageNetwork.static') }}
               </h3>
               <b-table
                 responsive="md"
@@ -192,9 +192,9 @@
                 <template #cell(Address)="{ item, index }">
                   <b-form-input
                     v-model.trim="item.Address"
-                    :data-test-id="`networkSettings-input-staticIpv4-${index}`"
+                    :data-test-id="`network-input-staticIpv4-${index}`"
                     :aria-label="
-                      $t('pageNetworkSettings.table.staticIpv4AddressRow') +
+                      $t('pageNetwork.table.staticIpv4AddressRow') +
                       ' ' +
                       (index + 1)
                     "
@@ -231,9 +231,9 @@
                 <template #cell(SubnetMask)="{ item, index }">
                   <b-form-input
                     v-model.trim="item.SubnetMask"
-                    :data-test-id="`networkSettings-input-subnetMask-${index}`"
+                    :data-test-id="`network-input-subnetMask-${index}`"
                     :aria-label="
-                      $t('pageNetworkSettings.table.staticIpv4SubnetRow') +
+                      $t('pageNetwork.table.staticIpv4SubnetRow') +
                       ' ' +
                       (index + 1)
                     "
@@ -286,12 +286,12 @@
               </b-table>
               <b-button variant="link" @click="addIpv4StaticTableRow">
                 <icon-add />
-                {{ $t('pageNetworkSettings.table.addStaticIpv4Address') }}
+                {{ $t('pageNetwork.table.addStaticIpv4Address') }}
               </b-button>
             </b-col>
           </b-row>
         </page-section>
-        <page-section :section-title="$t('pageNetworkSettings.staticDns')">
+        <page-section :section-title="$t('pageNetwork.staticDns')">
           <b-row>
             <b-col lg="4" class="mb-3">
               <b-table
@@ -306,11 +306,9 @@
                 <template #cell(address)="{ item, index }">
                   <b-form-input
                     v-model.trim="item.address"
-                    :data-test-id="`networkSettings-input-dnsAddress-${index}`"
+                    :data-test-id="`network-input-dnsAddress-${index}`"
                     :aria-label="
-                      $t('pageNetworkSettings.table.staticDnsRow') +
-                      ' ' +
-                      (index + 1)
+                      $t('pageNetwork.table.staticDnsRow') + ' ' + (index + 1)
                     "
                     :state="
                       getValidationState(
@@ -357,7 +355,7 @@
                 </template>
               </b-table>
               <b-button variant="link" @click="addDnsTableRow">
-                <icon-add /> {{ $t('pageNetworkSettings.table.addDns') }}
+                <icon-add /> {{ $t('pageNetwork.table.addDns') }}
               </b-button>
             </b-col>
           </b-row>
@@ -365,7 +363,7 @@
         <b-button
           variant="primary"
           type="submit"
-          data-test-id="networkSettings-button-saveNetworkSettings"
+          data-test-id="network-button-saveNetworkSettings"
         >
           {{ $t('global.action.saveSettings') }}
         </b-button>
@@ -395,7 +393,7 @@
 const validateHostname = helpers.regex('validateHostname', /^\S{0,64}$/);
 
 export default {
-  name: 'NetworkSettings',
+  name: 'Network',
   components: {
     PageTitle,
     PageSection,
@@ -413,29 +411,29 @@
       ipv4DhcpTableFields: [
         {
           key: 'Address',
-          label: this.$t('pageNetworkSettings.table.ipAddress'),
+          label: this.$t('pageNetwork.table.ipAddress'),
         },
         {
           key: 'SubnetMask',
-          label: this.$t('pageNetworkSettings.table.subnet'),
+          label: this.$t('pageNetwork.table.subnet'),
         },
         { key: 'actions', label: '', tdClass: 'text-right' },
       ],
       ipv4StaticTableFields: [
         {
           key: 'Address',
-          label: this.$t('pageNetworkSettings.table.ipAddress'),
+          label: this.$t('pageNetwork.table.ipAddress'),
         },
         {
           key: 'SubnetMask',
-          label: this.$t('pageNetworkSettings.table.subnet'),
+          label: this.$t('pageNetwork.table.subnet'),
         },
         { key: 'actions', label: '', tdClass: 'text-right' },
       ],
       dnsTableFields: [
         {
           key: 'address',
-          label: this.$t('pageNetworkSettings.table.ipAddress'),
+          label: this.$t('pageNetwork.table.ipAddress'),
         },
         { key: 'actions', label: '', tdClass: 'text-right' },
       ],
@@ -483,7 +481,7 @@
     };
   },
   computed: {
-    ...mapState('networkSettings', [
+    ...mapState('network', [
       'ethernetData',
       'interfaceOptions',
       'defaultGateway',
@@ -505,7 +503,7 @@
   created() {
     this.startLoader();
     this.$store
-      .dispatch('networkSettings/getEthernetData')
+      .dispatch('network/getEthernetData')
       .finally(() => this.endLoader());
   },
   methods: {
@@ -534,7 +532,7 @@
             {
               value: 'delete',
               enabled: this.form.dhcpEnabled,
-              title: this.$t('pageNetworkSettings.table.deleteDns'),
+              title: this.$t('pageNetwork.table.deleteDns'),
             },
           ],
         };
@@ -548,7 +546,7 @@
           {
             value: 'delete',
             enabled: this.form.dhcpEnabled,
-            title: this.$t('pageNetworkSettings.table.deleteDns'),
+            title: this.$t('pageNetwork.table.deleteDns'),
           },
         ],
       });
@@ -572,7 +570,7 @@
               {
                 value: 'delete',
                 enabled: false,
-                title: this.$t('pageNetworkSettings.table.deleteDhcpIpv4'),
+                title: this.$t('pageNetwork.table.deleteDhcpIpv4'),
               },
             ],
           };
@@ -588,7 +586,7 @@
             {
               value: 'delete',
               enabled: this.form.dhcpEnabled,
-              title: this.$t('pageNetworkSettings.table.deleteStaticIpv4'),
+              title: this.$t('pageNetwork.table.deleteStaticIpv4'),
             },
           ],
         };
@@ -603,7 +601,7 @@
           {
             value: 'delete',
             enabled: this.form.dhcpEnabled,
-            title: this.$t('pageNetworkSettings.table.deleteStaticIpv4'),
+            title: this.$t('pageNetwork.table.deleteStaticIpv4'),
           },
         ],
       });
@@ -636,9 +634,7 @@
         networkSettingsForm.isDhcpEnabled = isDhcpEnabled;
       } else {
         networkSettingsForm.isDhcpEnabled = false;
-        this.errorToast(
-          this.$t('pageNetworkSettings.toast.errorSaveDhcpSettings')
-        );
+        this.errorToast(this.$t('pageNetwork.toast.errorSaveDhcpSettings'));
       }
       networkSettingsForm.staticIpv4 = this.form.ipv4StaticTableItems.map(
         (updateIpv4) => {
@@ -653,10 +649,7 @@
         }
       );
       this.$store
-        .dispatch(
-          'networkSettings/updateInterfaceSettings',
-          networkSettingsForm
-        )
+        .dispatch('network/updateInterfaceSettings', networkSettingsForm)
         .then((success) => {
           this.successToast(success);
         })
diff --git a/src/views/Settings/Network/index.js b/src/views/Settings/Network/index.js
new file mode 100644
index 0000000..97bf039
--- /dev/null
+++ b/src/views/Settings/Network/index.js
@@ -0,0 +1,2 @@
+import Network from './Network.vue';
+export default Network;
diff --git a/src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue b/src/views/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
similarity index 100%
rename from src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue
rename to src/views/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
diff --git a/src/views/Operations/PowerRestorePolicy/index.js b/src/views/Settings/PowerRestorePolicy/index.js
similarity index 100%
rename from src/views/Operations/PowerRestorePolicy/index.js
rename to src/views/Settings/PowerRestorePolicy/index.js
diff --git a/src/views/Configuration/SecuritySettings/SecuritySettings.vue b/src/views/Settings/SecuritySettings/SecuritySettings.vue
similarity index 100%
rename from src/views/Configuration/SecuritySettings/SecuritySettings.vue
rename to src/views/Settings/SecuritySettings/SecuritySettings.vue
diff --git a/src/views/Configuration/SecuritySettings/index.js b/src/views/Settings/SecuritySettings/index.js
similarity index 100%
rename from src/views/Configuration/SecuritySettings/index.js
rename to src/views/Settings/SecuritySettings/index.js