diff --git a/__tests__/__unit__/__snapshots__/extension.unit.test.ts.snap b/__tests__/__unit__/__snapshots__/extension.unit.test.ts.snap
index 1eaff18e5c..beecf865ab 100644
--- a/__tests__/__unit__/__snapshots__/extension.unit.test.ts.snap
+++ b/__tests__/__unit__/__snapshots__/extension.unit.test.ts.snap
@@ -3,19 +3,19 @@
 exports[`Extension Unit Tests should not change the existing context menus 1`] = `
 Array [
   Object {
-    "command": "zowe.uss.createFile",
-    "group": "1_create",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
+    "command": "zowe.uss.fullPath",
+    "group": "inline",
+    "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
   },
   Object {
-    "command": "zowe.uss.createFolder",
-    "group": "1_create",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
+    "command": "zowe.uss.createNode",
+    "group": "inline",
+    "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
   },
   Object {
-    "command": "zowe.uss.addFavorite",
-    "group": "4_workspace",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)(textFile.*|binaryFile.*|directory.*)/",
+    "command": "zowe.uss.editSession",
+    "group": "inline",
+    "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
   },
   Object {
     "command": "zowe.uss.editFile",
@@ -33,128 +33,128 @@ Array [
     "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(directory|ussSession|favorite))/",
   },
   Object {
-    "command": "zowe.uss.deleteNode",
-    "group": "6_modification@2",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite|.*_fav))/",
+    "command": "zowe.uss.createFolder",
+    "group": "1_create@0",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
   },
   Object {
-    "command": "zowe.uss.copyPath",
-    "group": "5_copyPath",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite))/",
+    "command": "zowe.uss.createFile",
+    "group": "1_create@1",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
   },
   Object {
-    "command": "zowe.uss.editFile",
-    "group": "6_modification@0",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^textFile|binaryFile/",
+    "command": "zowe.uss.uploadDialog",
+    "group": "1_create@2",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
   },
   Object {
-    "command": "zowe.uss.renameNode",
-    "group": "6_modification@1",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite))/",
+    "command": "zowe.issueMvsCmd",
+    "group": "2_systemSpecific@0",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
   },
   Object {
     "command": "zowe.uss.binary",
-    "group": "3_systemSpecific",
+    "group": "2_systemSpecific@1",
     "when": "view == zowe.uss.explorer && viewItem =~ /^textFile.*/",
   },
   Object {
-    "command": "zowe.uss.removeFavorite",
-    "group": "4_workspace",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!ussSession.*).*_fav.*/",
+    "command": "zowe.uss.text",
+    "group": "2_systemSpecific@2",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^binaryFile.*/",
   },
   Object {
-    "command": "zowe.uss.removeSavedSearch",
-    "group": "4_workspace",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^ussSession.*_fav.*/",
+    "command": "zowe.uss.addFavorite",
+    "group": "3_workspace@0",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)(textFile.*|binaryFile.*|directory.*)/",
   },
   Object {
-    "command": "zowe.uss.text",
-    "group": "3_systemSpecific",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^binaryFile.*/",
+    "command": "zowe.uss.removeFavorite",
+    "group": "3_workspace@1",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!ussSession.*).*_fav.*/",
   },
   Object {
-    "command": "zowe.uss.uploadDialog",
-    "group": "1_create",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
+    "command": "zowe.uss.saveSearch",
+    "group": "3_workspace@2",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
   },
   Object {
-    "command": "zowe.editMember",
-    "group": "inline",
-    "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
+    "command": "zowe.uss.removeSavedSearch",
+    "group": "3_workspace@3",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^ussSession.*_fav.*/",
   },
   Object {
-    "command": "zowe.refreshNode",
-    "group": "inline",
-    "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
+    "command": "zowe.uss.copyPath",
+    "group": "4_copyPath",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite))/",
   },
   Object {
-    "command": "zowe.refreshNode",
-    "group": "0_mainframeInteraction",
-    "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
+    "command": "zowe.uss.editFile",
+    "group": "5_modification@0",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^textFile|binaryFile/",
   },
   Object {
-    "command": "zowe.deleteMember",
-    "group": "6_modification@2",
-    "when": "view == zowe.explorer && viewItem =~ /^member.*/",
+    "command": "zowe.all.profilelink",
+    "group": "5_modification@1",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
   },
   Object {
-    "command": "zowe.deleteDataset",
+    "command": "zowe.uss.removeSession",
     "group": "6_modification@2",
-    "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
+    "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
   },
   Object {
-    "command": "zowe.addFavorite",
-    "group": "4_workspace",
-    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav)(member|migr|ds|pds).*/",
+    "command": "zowe.uss.renameNode",
+    "group": "5_modification@3",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite))/",
   },
   Object {
-    "command": "zowe.submitMember",
-    "group": "3_systemSpecific",
-    "when": "view == zowe.explorer && viewItem =~ /^member.*/",
+    "command": "zowe.uss.deleteNode",
+    "group": "5_modification@4",
+    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite|.*_fav))/",
   },
   Object {
-    "command": "zowe.copyDataSet",
-    "group": "9_cutcopypaste",
-    "when": "view == zowe.explorer && viewItem =~ /^(member|ds).*/",
+    "command": "zowe.uss.deleteProfile",
+    "group": "6_modification@5",
+    "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
   },
   Object {
     "command": "zowe.editMember",
-    "group": "6_modification@0",
-    "when": "view == zowe.explorer && viewItem =~ /^(member|ds).*/",
+    "group": "inline",
+    "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
   },
   Object {
-    "command": "zowe.renameDataSetMember",
-    "group": "6_modification@2",
-    "when": "view == zowe.explorer && viewItem =~ /^member.*/",
+    "command": "zowe.refreshNode",
+    "group": "inline",
+    "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
   },
   Object {
-    "command": "zowe.submitMember",
-    "group": "3_systemSpecific",
-    "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
+    "command": "zowe.pattern",
+    "group": "inline",
+    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
   },
   Object {
-    "command": "zowe.renameDataSet",
-    "group": "6_modification@2",
-    "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
+    "command": "zowe.createDataset",
+    "group": "inline",
+    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
   },
   Object {
-    "command": "zowe.pasteDataSet",
-    "group": "9_cutcopypaste",
-    "when": "view == zowe.explorer && viewItem =~ /^(ds.*|^pds.*)/",
+    "command": "zowe.editSession",
+    "group": "inline",
+    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
   },
   Object {
-    "command": "zowe.hMigrateDataSet",
-    "group": "7_hsmcommands",
-    "when": "view == zowe.explorer && viewItem =~ /^(ds.*|^pds.*)/",
+    "command": "zowe.refreshNode",
+    "group": "0_mainframeInteraction",
+    "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
   },
   Object {
-    "command": "zowe.hRecallDataSet",
-    "group": "8_hsmcommands",
-    "when": "view == zowe.explorer && viewItem =~ /^migr.*/",
+    "command": "zowe.createMember",
+    "group": "1_create@0",
+    "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
   },
   Object {
-    "command": "zowe.createMember",
-    "group": "1_create",
+    "command": "zowe.uploadDialog",
+    "group": "1_create@1",
     "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
   },
   Object {
@@ -163,113 +163,109 @@ Array [
     "when": "view == zowe.explorer && viewItem =~ /^(pds|migr|ds|vsam).*/",
   },
   Object {
-    "command": "zowe.deletePDS",
-    "group": "6_modification@2",
-    "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
+    "command": "zowe.submitMember",
+    "group": "3_systemSpecific",
+    "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
   },
   Object {
-    "command": "zowe.uploadDialog",
-    "group": "1_create",
-    "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
+    "command": "zowe.submitMember",
+    "group": "3_systemSpecific",
+    "when": "view == zowe.explorer && viewItem =~ /^member.*/",
   },
   Object {
-    "command": "zowe.renameDataSet",
-    "group": "6_modification@2",
-    "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
+    "command": "zowe.issueMvsCmd",
+    "group": "3_systemSpecific",
+    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
   },
   Object {
-    "command": "zowe.removeFavorite",
-    "group": "4_workspace",
-    "when": "view == zowe.explorer && viewItem =~ /^(pds|ds|migr).*_fav.*/",
+    "command": "zowe.hRecallDataSet",
+    "group": "4_hsmCommands@0",
+    "when": "view == zowe.explorer && viewItem =~ /^migr.*/",
   },
   Object {
-    "command": "zowe.pattern",
-    "group": "inline",
-    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+    "command": "zowe.hMigrateDataSet",
+    "group": "4_hsmCommands@1",
+    "when": "view == zowe.explorer && viewItem =~ /^(ds.*|^pds.*)/",
   },
   Object {
-    "command": "zowe.all.profilelink",
-    "group": "inline",
-    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+    "command": "zowe.addFavorite",
+    "group": "5_workspace@0",
+    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav)(member|migr|ds|pds).*/",
   },
   Object {
-    "command": "zowe.createDataset",
-    "group": "inline",
-    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+    "command": "zowe.removeFavorite",
+    "group": "5_workspace@1",
+    "when": "view == zowe.explorer && viewItem =~ /^(pds|ds|migr).*_fav.*/",
   },
   Object {
-    "command": "zowe.editSession",
-    "group": "inline",
+    "command": "zowe.saveSearch",
+    "group": "5_workspace@2",
     "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
   },
   Object {
-    "command": "zowe.deleteProfile",
-    "group": "6_modification@4",
-    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+    "command": "zowe.removeSavedSearch",
+    "group": "5_workspace@3",
+    "when": "view == zowe.explorer && viewItem =~ /^session.*_fav.*/",
   },
   Object {
-    "command": "zowe.removeSession",
-    "group": "6_modification@3",
-    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+    "command": "zowe.copyDataSet",
+    "group": "6_cutCopyPaste@0",
+    "when": "view == zowe.explorer && viewItem =~ /^(member|ds).*/",
   },
   Object {
-    "command": "zowe.saveSearch",
-    "group": "4_workspace",
-    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+    "command": "zowe.pasteDataSet",
+    "group": "6_cutCopyPaste@1",
+    "when": "view == zowe.explorer && viewItem =~ /^(ds.*|^pds.*)/",
   },
   Object {
-    "command": "zowe.issueMvsCmd",
-    "group": "3_systemSpecific",
+    "command": "zowe.all.profilelink",
+    "group": "7_modification@0",
     "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
   },
   Object {
-    "command": "zowe.removeSavedSearch",
-    "when": "view == zowe.explorer && viewItem =~ /^session.*_fav.*/",
-  },
-  Object {
-    "command": "zowe.all.profilelink",
-    "group": "inline",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+    "command": "zowe.removeSession",
+    "group": "7_modification@1",
+    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
   },
   Object {
-    "command": "zowe.uss.fullPath",
-    "group": "inline",
-    "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+    "command": "zowe.editMember",
+    "group": "7_modification@2",
+    "when": "view == zowe.explorer && viewItem =~ /^(member|ds).*/",
   },
   Object {
-    "command": "zowe.uss.createNode",
-    "group": "inline",
-    "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+    "command": "zowe.renameDataSetMember",
+    "group": "7_modification@3",
+    "when": "view == zowe.explorer && viewItem =~ /^member.*/",
   },
   Object {
-    "command": "zowe.uss.editSession",
-    "group": "inline",
-    "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+    "command": "zowe.renameDataSet",
+    "group": "7_modification@3",
+    "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
   },
   Object {
-    "command": "zowe.uss.deleteProfile",
-    "group": "6_modification@4",
-    "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+    "command": "zowe.renameDataSet",
+    "group": "7_modification@3",
+    "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
   },
   Object {
-    "command": "zowe.uss.removeSession",
-    "group": "6_modification@3",
-    "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+    "command": "zowe.deleteDataset",
+    "group": "7_modification@4",
+    "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
   },
   Object {
-    "command": "zowe.uss.saveSearch",
-    "group": "4_workspace",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+    "command": "zowe.deleteMember",
+    "group": "7_modification@4",
+    "when": "view == zowe.explorer && viewItem =~ /^member.*/",
   },
   Object {
-    "command": "zowe.issueMvsCmd",
-    "group": "3_systemSpecific",
-    "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+    "command": "zowe.deletePDS",
+    "group": "7_modification@4",
+    "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
   },
   Object {
-    "command": "zowe.all.profilelink",
-    "group": "inline",
-    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
+    "command": "zowe.deleteProfile",
+    "group": "7_modification@5",
+    "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
   },
   Object {
     "command": "zowe.refreshJobsServer",
@@ -287,9 +283,14 @@ Array [
     "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
   },
   Object {
-    "command": "zowe.jobs.deleteProfile",
-    "group": "6_modification@4",
-    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
+    "command": "zowe.deleteJob",
+    "group": "inline",
+    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
+  },
+  Object {
+    "command": "zowe.downloadSpool",
+    "group": "inline",
+    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
   },
   Object {
     "command": "zowe.setOwner",
@@ -300,59 +301,59 @@ Array [
     "when": "view == zowe.jobs && viewItem =~/^(?!.*_fav.*)server.*/",
   },
   Object {
-    "command": "zowe.removeJobsSession",
-    "group": "6_modification@3",
-    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
+    "command": "zowe.getJobJcl",
+    "group": "0_mainframeInteraction",
+    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
   },
   Object {
-    "command": "zowe.deleteJob",
-    "group": "inline",
-    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
+    "command": "zowe.issueMvsCmd",
+    "group": "1_systemSpecific@0",
+    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
   },
   Object {
     "command": "zowe.runModifyCommand",
-    "group": "3_systemSpecific",
+    "group": "1_systemSpecific@1",
     "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
   },
   Object {
     "command": "zowe.runStopCommand",
-    "group": "3_systemSpecific",
-    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
-  },
-  Object {
-    "command": "zowe.downloadSpool",
-    "group": "inline",
+    "group": "1_systemSpecific@2",
     "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
   },
   Object {
     "command": "zowe.jobs.addFavorite",
-    "group": "4_workspace",
+    "group": "2_workspace@0",
     "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
   },
   Object {
     "command": "zowe.jobs.removeFavorite",
-    "group": "4_workspace",
+    "group": "2_workspace@0",
     "when": "view == zowe.jobs && viewItem =~ /^job.*_fav.*/",
   },
+  Object {
+    "command": "zowe.jobs.saveSearch",
+    "group": "2_workspace@0",
+    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
+  },
   Object {
     "command": "zowe.jobs.removeSearchFavorite",
-    "group": "4_workspace",
+    "group": "2_workspace@0",
     "when": "view == zowe.jobs && viewItem =~ /^server.*_fav.*/",
   },
   Object {
-    "command": "zowe.jobs.saveSearch",
-    "group": "4_workspace",
+    "command": "zowe.all.profilelink",
+    "group": "3_modification@0",
     "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
   },
   Object {
-    "command": "zowe.issueMvsCmd",
-    "group": "3_systemSpecific",
+    "command": "zowe.removeJobsSession",
+    "group": "3_modification@1",
     "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
   },
   Object {
-    "command": "zowe.getJobJcl",
-    "group": "0_mainframeInteraction",
-    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
+    "command": "zowe.jobs.deleteProfile",
+    "group": "3_modification@2",
+    "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
   },
 ]
 `;
diff --git a/package.json b/package.json
index c4953fb911..d32e9b7359 100644
--- a/package.json
+++ b/package.json
@@ -487,19 +487,19 @@
       ],
       "view/item/context": [
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
-          "command": "zowe.uss.createFile",
-          "group": "1_create"
+          "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+          "command": "zowe.uss.fullPath",
+          "group": "inline"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
-          "command": "zowe.uss.createFolder",
-          "group": "1_create"
+          "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+          "command": "zowe.uss.createNode",
+          "group": "inline"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)(textFile.*|binaryFile.*|directory.*)/",
-          "command": "zowe.uss.addFavorite",
-          "group": "4_workspace"
+          "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+          "command": "zowe.uss.editSession",
+          "group": "inline"
         },
         {
           "when": "view == zowe.uss.explorer && viewItem =~ /^textFile|binaryFile/",
@@ -517,129 +517,129 @@
           "group": "0_mainframeInteraction"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite|.*_fav))/",
-          "command": "zowe.uss.deleteNode",
-          "group": "6_modification@2"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
+          "command": "zowe.uss.createFolder",
+          "group": "1_create@0"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite))/",
-          "command": "zowe.uss.copyPath",
-          "group": "5_copyPath"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
+          "command": "zowe.uss.createFile",
+          "group": "1_create@1"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^textFile|binaryFile/",
-          "command": "zowe.uss.editFile",
-          "group": "6_modification@0"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
+          "command": "zowe.uss.uploadDialog",
+          "group": "1_create@2"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite))/",
-          "command": "zowe.uss.renameNode",
-          "group": "6_modification@1"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+          "command": "zowe.issueMvsCmd",
+          "group": "2_systemSpecific@0"
         },
         {
           "when": "view == zowe.uss.explorer && viewItem =~ /^textFile.*/",
           "command": "zowe.uss.binary",
-          "group": "3_systemSpecific"
+          "group": "2_systemSpecific@1"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!ussSession.*).*_fav.*/",
-          "command": "zowe.uss.removeFavorite",
-          "group": "4_workspace"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^binaryFile.*/",
+          "command": "zowe.uss.text",
+          "group": "2_systemSpecific@2"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^ussSession.*_fav.*/",
-          "command": "zowe.uss.removeSavedSearch",
-          "group": "4_workspace"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)(textFile.*|binaryFile.*|directory.*)/",
+          "command": "zowe.uss.addFavorite",
+          "group": "3_workspace@0"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^binaryFile.*/",
-          "command": "zowe.uss.text",
-          "group": "3_systemSpecific"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!ussSession.*).*_fav.*/",
+          "command": "zowe.uss.removeFavorite",
+          "group": "3_workspace@1"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^directory.*/",
-          "command": "zowe.uss.uploadDialog",
-          "group": "1_create"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+          "command": "zowe.uss.saveSearch",
+          "group": "3_workspace@2"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
-          "command": "zowe.editMember",
-          "group": "inline"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^ussSession.*_fav.*/",
+          "command": "zowe.uss.removeSavedSearch",
+          "group": "3_workspace@3"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
-          "command": "zowe.refreshNode",
-          "group": "inline"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite))/",
+          "command": "zowe.uss.copyPath",
+          "group": "4_copyPath"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
-          "command": "zowe.refreshNode",
-          "group": "0_mainframeInteraction"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^textFile|binaryFile/",
+          "command": "zowe.uss.editFile",
+          "group": "5_modification@0"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^member.*/",
-          "command": "zowe.deleteMember",
-          "group": "6_modification@2"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+          "command": "zowe.all.profilelink",
+          "group": "5_modification@1"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
-          "command": "zowe.deleteDataset",
+          "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+          "command": "zowe.uss.removeSession",
           "group": "6_modification@2"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav)(member|migr|ds|pds).*/",
-          "command": "zowe.addFavorite",
-          "group": "4_workspace"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite))/",
+          "command": "zowe.uss.renameNode",
+          "group": "5_modification@3"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^member.*/",
-          "command": "zowe.submitMember",
-          "group": "3_systemSpecific"
+          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!(ussSession|favorite|.*_fav))/",
+          "command": "zowe.uss.deleteNode",
+          "group": "5_modification@4"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(member|ds).*/",
-          "command": "zowe.copyDataSet",
-          "group": "9_cutcopypaste"
+          "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
+          "command": "zowe.uss.deleteProfile",
+          "group": "6_modification@5"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(member|ds).*/",
+          "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
           "command": "zowe.editMember",
-          "group": "6_modification@0"
+          "group": "inline"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^member.*/",
-          "command": "zowe.renameDataSetMember",
-          "group": "6_modification@2"
+          "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
+          "command": "zowe.refreshNode",
+          "group": "inline"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
-          "command": "zowe.submitMember",
-          "group": "3_systemSpecific"
+          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+          "command": "zowe.pattern",
+          "group": "inline"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
-          "command": "zowe.renameDataSet",
-          "group": "6_modification@2"
+          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+          "command": "zowe.createDataset",
+          "group": "inline"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(ds.*|^pds.*)/",
-          "command": "zowe.pasteDataSet",
-          "group": "9_cutcopypaste"
+          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+          "command": "zowe.editSession",
+          "group": "inline"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(ds.*|^pds.*)/",
-          "command": "zowe.hMigrateDataSet",
-          "group": "7_hsmcommands"
+          "when": "view == zowe.explorer && viewItem =~ /^(member.*|ds.*)/",
+          "command": "zowe.refreshNode",
+          "group": "0_mainframeInteraction"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^migr.*/",
-          "command": "zowe.hRecallDataSet",
-          "group": "8_hsmcommands"
+          "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
+          "command": "zowe.createMember",
+          "group": "1_create@0"
         },
         {
           "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
-          "command": "zowe.createMember",
-          "group": "1_create"
+          "command": "zowe.uploadDialog",
+          "group": "1_create@1"
         },
         {
           "when": "view == zowe.explorer && viewItem =~ /^(pds|migr|ds|vsam).*/",
@@ -647,113 +647,109 @@
           "group": "2_information"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
-          "command": "zowe.deletePDS",
-          "group": "6_modification@2"
+          "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
+          "command": "zowe.submitMember",
+          "group": "3_systemSpecific"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
-          "command": "zowe.uploadDialog",
-          "group": "1_create"
+          "when": "view == zowe.explorer && viewItem =~ /^member.*/",
+          "command": "zowe.submitMember",
+          "group": "3_systemSpecific"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
-          "command": "zowe.renameDataSet",
-          "group": "6_modification@2"
+          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+          "command": "zowe.issueMvsCmd",
+          "group": "3_systemSpecific"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(pds|ds|migr).*_fav.*/",
-          "command": "zowe.removeFavorite",
-          "group": "4_workspace"
+          "when": "view == zowe.explorer && viewItem =~ /^migr.*/",
+          "command": "zowe.hRecallDataSet",
+          "group": "4_hsmCommands@0"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
-          "command": "zowe.pattern",
-          "group": "inline"
+          "when": "view == zowe.explorer && viewItem =~ /^(ds.*|^pds.*)/",
+          "command": "zowe.hMigrateDataSet",
+          "group": "4_hsmCommands@1"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
-          "command": "zowe.all.profilelink",
-          "group": "inline"
+          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav)(member|migr|ds|pds).*/",
+          "command": "zowe.addFavorite",
+          "group": "5_workspace@0"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
-          "command": "zowe.createDataset",
-          "group": "inline"
+          "when": "view == zowe.explorer && viewItem =~ /^(pds|ds|migr).*_fav.*/",
+          "command": "zowe.removeFavorite",
+          "group": "5_workspace@1"
         },
         {
           "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
-          "command": "zowe.editSession",
-          "group": "inline"
+          "command": "zowe.saveSearch",
+          "group": "5_workspace@2"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
-          "command": "zowe.deleteProfile",
-          "group": "6_modification@4"
+          "when": "view == zowe.explorer && viewItem =~ /^session.*_fav.*/",
+          "command": "zowe.removeSavedSearch",
+          "group": "5_workspace@3"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
-          "command": "zowe.removeSession",
-          "group": "6_modification@3"
+          "when": "view == zowe.explorer && viewItem =~ /^(member|ds).*/",
+          "command": "zowe.copyDataSet",
+          "group": "6_cutCopyPaste@0"
         },
         {
-          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
-          "command": "zowe.saveSearch",
-          "group": "4_workspace"
+          "when": "view == zowe.explorer && viewItem =~ /^(ds.*|^pds.*)/",
+          "command": "zowe.pasteDataSet",
+          "group": "6_cutCopyPaste@1"
         },
         {
           "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
-          "command": "zowe.issueMvsCmd",
-          "group": "3_systemSpecific"
-        },
-        {
-          "when": "view == zowe.explorer && viewItem =~ /^session.*_fav.*/",
-          "command": "zowe.removeSavedSearch"
+          "command": "zowe.all.profilelink",
+          "group": "7_modification@0"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
-          "command": "zowe.all.profilelink",
-          "group": "inline"
+          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+          "command": "zowe.removeSession",
+          "group": "7_modification@1"
         },
         {
-          "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
-          "command": "zowe.uss.fullPath",
-          "group": "inline"
+          "when": "view == zowe.explorer && viewItem =~ /^(member|ds).*/",
+          "command": "zowe.editMember",
+          "group": "7_modification@2"
         },
         {
-          "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
-          "command": "zowe.uss.createNode",
-          "group": "inline"
+          "when": "view == zowe.explorer && viewItem =~ /^member.*/",
+          "command": "zowe.renameDataSetMember",
+          "group": "7_modification@3"
         },
         {
-          "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
-          "command": "zowe.uss.editSession",
-          "group": "inline"
+          "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
+          "command": "zowe.renameDataSet",
+          "group": "7_modification@3"
         },
         {
-          "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
-          "command": "zowe.uss.deleteProfile",
-          "group": "6_modification@4"
+          "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
+          "command": "zowe.renameDataSet",
+          "group": "7_modification@3"
         },
         {
-          "when": "viewItem =~ /^(?!.*_fav.*)ussSession.*/",
-          "command": "zowe.uss.removeSession",
-          "group": "6_modification@3"
+          "when": "view == zowe.explorer && viewItem =~ /^ds.*/",
+          "command": "zowe.deleteDataset",
+          "group": "7_modification@4"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
-          "command": "zowe.uss.saveSearch",
-          "group": "4_workspace"
+          "when": "view == zowe.explorer && viewItem =~ /^member.*/",
+          "command": "zowe.deleteMember",
+          "group": "7_modification@4"
         },
         {
-          "when": "view == zowe.uss.explorer && viewItem =~ /^(?!.*_fav.*)ussSession.*/",
-          "command": "zowe.issueMvsCmd",
-          "group": "3_systemSpecific"
+          "when": "view == zowe.explorer && viewItem =~ /^pds.*/",
+          "command": "zowe.deletePDS",
+          "group": "7_modification@4"
         },
         {
-          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
-          "command": "zowe.all.profilelink",
-          "group": "inline"
+          "when": "view == zowe.explorer && viewItem =~ /^(?!.*_fav.*)session.*/",
+          "command": "zowe.deleteProfile",
+          "group": "7_modification@5"
         },
         {
           "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
@@ -771,9 +767,14 @@
           "group": "inline"
         },
         {
-          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
-          "command": "zowe.jobs.deleteProfile",
-          "group": "6_modification@4"
+          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
+          "command": "zowe.deleteJob",
+          "group": "inline"
+        },
+        {
+          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
+          "command": "zowe.downloadSpool",
+          "group": "inline"
         },
         {
           "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
@@ -784,59 +785,59 @@
           "command": "zowe.setPrefix"
         },
         {
-          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
-          "command": "zowe.removeJobsSession",
-          "group": "6_modification@3"
+          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
+          "command": "zowe.getJobJcl",
+          "group": "0_mainframeInteraction"
         },
         {
-          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
-          "command": "zowe.deleteJob",
-          "group": "inline"
+          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
+          "command": "zowe.issueMvsCmd",
+          "group": "1_systemSpecific@0"
         },
         {
           "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
           "command": "zowe.runModifyCommand",
-          "group": "3_systemSpecific"
+          "group": "1_systemSpecific@1"
         },
         {
           "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
           "command": "zowe.runStopCommand",
-          "group": "3_systemSpecific"
-        },
-        {
-          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
-          "command": "zowe.downloadSpool",
-          "group": "inline"
+          "group": "1_systemSpecific@2"
         },
         {
           "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
           "command": "zowe.jobs.addFavorite",
-          "group": "4_workspace"
+          "group": "2_workspace@0"
         },
         {
           "when": "view == zowe.jobs && viewItem =~ /^job.*_fav.*/",
           "command": "zowe.jobs.removeFavorite",
-          "group": "4_workspace"
+          "group": "2_workspace@0"
+        },
+        {
+          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
+          "command": "zowe.jobs.saveSearch",
+          "group": "2_workspace@0"
         },
         {
           "when": "view == zowe.jobs && viewItem =~ /^server.*_fav.*/",
           "command": "zowe.jobs.removeSearchFavorite",
-          "group": "4_workspace"
+          "group": "2_workspace@0"
         },
         {
           "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
-          "command": "zowe.jobs.saveSearch",
-          "group": "4_workspace"
+          "command": "zowe.all.profilelink",
+          "group": "3_modification@0"
         },
         {
           "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
-          "command": "zowe.issueMvsCmd",
-          "group": "3_systemSpecific"
+          "command": "zowe.removeJobsSession",
+          "group": "3_modification@1"
         },
         {
-          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)job.*/",
-          "command": "zowe.getJobJcl",
-          "group": "0_mainframeInteraction"
+          "when": "view == zowe.jobs && viewItem =~ /^(?!.*_fav.*)server.*/",
+          "command": "zowe.jobs.deleteProfile",
+          "group": "3_modification@2"
         }
       ],
       "commandPalette": [