diff --git a/package-lock.json b/package-lock.json
index 3ecbf69ca3..fc13b55540 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4734,11 +4734,11 @@
       "link": true
     },
     "node_modules/@k8slens/messaging-for-main": {
-      "resolved": "packages/technical-features/messaging/main",
+      "resolved": "packages/technical-features/messaging/electron/main",
       "link": true
     },
     "node_modules/@k8slens/messaging-for-renderer": {
-      "resolved": "packages/technical-features/messaging/renderer",
+      "resolved": "packages/technical-features/messaging/electron/renderer",
       "link": true
     },
     "node_modules/@k8slens/node-fetch": {
@@ -37236,6 +37236,7 @@
       }
     },
     "packages/technical-features/messaging/computed-channel": {
+      "name": "@k8slens/computed-channel",
       "version": "1.0.0-alpha.1",
       "license": "MIT",
       "devDependencies": {
@@ -37255,7 +37256,7 @@
         "mobx": "^6.8.0"
       }
     },
-    "packages/technical-features/messaging/main": {
+    "packages/technical-features/messaging/electron/main": {
       "name": "@k8slens/messaging-for-main",
       "version": "1.0.0-alpha.1",
       "license": "MIT",
@@ -37272,6 +37273,24 @@
         "lodash": "^4.17.21"
       }
     },
+    "packages/technical-features/messaging/electron/renderer": {
+      "name": "@k8slens/messaging-for-renderer",
+      "version": "1.0.0-alpha.1",
+      "license": "MIT",
+      "devDependencies": {
+        "@k8slens/eslint-config": "^6.5.0-alpha.1"
+      },
+      "peerDependencies": {
+        "@k8slens/application": "^6.5.0-alpha.0",
+        "@k8slens/messaging": "^1.0.0-alpha.1",
+        "@k8slens/run-many": "^1.0.0-alpha.1",
+        "@k8slens/startable-stoppable": "^1.0.0-alpha.1",
+        "@ogre-tools/injectable": "^15.1.2",
+        "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
+        "electron": "^19.1.8",
+        "lodash": "^4.17.21"
+      }
+    },
     "packages/technical-features/messaging/message-bridge-fake": {
       "name": "@k8slens/messaging-fake-bridge",
       "version": "1.0.0-alpha.1",
@@ -37290,24 +37309,6 @@
         "lodash": "^4.17.21"
       }
     },
-    "packages/technical-features/messaging/renderer": {
-      "name": "@k8slens/messaging-for-renderer",
-      "version": "1.0.0-alpha.1",
-      "license": "MIT",
-      "devDependencies": {
-        "@k8slens/eslint-config": "^6.5.0-alpha.1"
-      },
-      "peerDependencies": {
-        "@k8slens/application": "^6.5.0-alpha.0",
-        "@k8slens/messaging": "^1.0.0-alpha.1",
-        "@k8slens/run-many": "^1.0.0-alpha.1",
-        "@k8slens/startable-stoppable": "^1.0.0-alpha.1",
-        "@ogre-tools/injectable": "^15.1.2",
-        "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2",
-        "electron": "^19.1.8",
-        "lodash": "^4.17.21"
-      }
-    },
     "packages/utility-features/run-many": {
       "name": "@k8slens/run-many",
       "version": "1.0.0-alpha.1",
diff --git a/packages/technical-features/messaging/main/.eslintrc.json b/packages/technical-features/messaging/electron/main/.eslintrc.json
similarity index 100%
rename from packages/technical-features/messaging/main/.eslintrc.json
rename to packages/technical-features/messaging/electron/main/.eslintrc.json
diff --git a/packages/technical-features/messaging/main/.prettierrc b/packages/technical-features/messaging/electron/main/.prettierrc
similarity index 100%
rename from packages/technical-features/messaging/main/.prettierrc
rename to packages/technical-features/messaging/electron/main/.prettierrc
diff --git a/packages/technical-features/messaging/main/index.ts b/packages/technical-features/messaging/electron/main/index.ts
similarity index 100%
rename from packages/technical-features/messaging/main/index.ts
rename to packages/technical-features/messaging/electron/main/index.ts
diff --git a/packages/technical-features/messaging/main/jest.config.js b/packages/technical-features/messaging/electron/main/jest.config.js
similarity index 100%
rename from packages/technical-features/messaging/main/jest.config.js
rename to packages/technical-features/messaging/electron/main/jest.config.js
diff --git a/packages/technical-features/messaging/main/package.json b/packages/technical-features/messaging/electron/main/package.json
similarity index 100%
rename from packages/technical-features/messaging/main/package.json
rename to packages/technical-features/messaging/electron/main/package.json
diff --git a/packages/technical-features/messaging/main/src/channel-listeners/enlist-message-channel-listener.injectable.ts b/packages/technical-features/messaging/electron/main/src/channel-listeners/enlist-message-channel-listener.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/channel-listeners/enlist-message-channel-listener.injectable.ts
rename to packages/technical-features/messaging/electron/main/src/channel-listeners/enlist-message-channel-listener.injectable.ts
diff --git a/packages/technical-features/messaging/main/src/channel-listeners/enlist-message-channel-listener.test.ts b/packages/technical-features/messaging/electron/main/src/channel-listeners/enlist-message-channel-listener.test.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/channel-listeners/enlist-message-channel-listener.test.ts
rename to packages/technical-features/messaging/electron/main/src/channel-listeners/enlist-message-channel-listener.test.ts
diff --git a/packages/technical-features/messaging/main/src/channel-listeners/enlist-request-channel-listener.injectable.ts b/packages/technical-features/messaging/electron/main/src/channel-listeners/enlist-request-channel-listener.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/channel-listeners/enlist-request-channel-listener.injectable.ts
rename to packages/technical-features/messaging/electron/main/src/channel-listeners/enlist-request-channel-listener.injectable.ts
diff --git a/packages/technical-features/messaging/main/src/channel-listeners/enlist-request-channel-listener.test.ts b/packages/technical-features/messaging/electron/main/src/channel-listeners/enlist-request-channel-listener.test.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/channel-listeners/enlist-request-channel-listener.test.ts
rename to packages/technical-features/messaging/electron/main/src/channel-listeners/enlist-request-channel-listener.test.ts
diff --git a/packages/technical-features/messaging/main/src/feature.ts b/packages/technical-features/messaging/electron/main/src/feature.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/feature.ts
rename to packages/technical-features/messaging/electron/main/src/feature.ts
diff --git a/packages/technical-features/messaging/main/src/ipc-main/ipc-main.injectable.ts b/packages/technical-features/messaging/electron/main/src/ipc-main/ipc-main.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/ipc-main/ipc-main.injectable.ts
rename to packages/technical-features/messaging/electron/main/src/ipc-main/ipc-main.injectable.ts
diff --git a/packages/technical-features/messaging/main/src/ipc-main/ipc-main.test.ts b/packages/technical-features/messaging/electron/main/src/ipc-main/ipc-main.test.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/ipc-main/ipc-main.test.ts
rename to packages/technical-features/messaging/electron/main/src/ipc-main/ipc-main.test.ts
diff --git a/packages/technical-features/messaging/main/src/request-from-channel/request-from-channel.injectable.ts b/packages/technical-features/messaging/electron/main/src/request-from-channel/request-from-channel.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/request-from-channel/request-from-channel.injectable.ts
rename to packages/technical-features/messaging/electron/main/src/request-from-channel/request-from-channel.injectable.ts
diff --git a/packages/technical-features/messaging/main/src/send-message-to-channel/allow-communication-listener.injectable.ts b/packages/technical-features/messaging/electron/main/src/send-message-to-channel/allow-communication-listener.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/send-message-to-channel/allow-communication-listener.injectable.ts
rename to packages/technical-features/messaging/electron/main/src/send-message-to-channel/allow-communication-listener.injectable.ts
diff --git a/packages/technical-features/messaging/main/src/send-message-to-channel/frameIds.injectable.ts b/packages/technical-features/messaging/electron/main/src/send-message-to-channel/frameIds.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/send-message-to-channel/frameIds.injectable.ts
rename to packages/technical-features/messaging/electron/main/src/send-message-to-channel/frameIds.injectable.ts
diff --git a/packages/technical-features/messaging/main/src/send-message-to-channel/get-web-contents.injectable.ts b/packages/technical-features/messaging/electron/main/src/send-message-to-channel/get-web-contents.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/send-message-to-channel/get-web-contents.injectable.ts
rename to packages/technical-features/messaging/electron/main/src/send-message-to-channel/get-web-contents.injectable.ts
diff --git a/packages/technical-features/messaging/main/src/send-message-to-channel/send-message-to-channel.injectable.test.ts b/packages/technical-features/messaging/electron/main/src/send-message-to-channel/send-message-to-channel.injectable.test.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/send-message-to-channel/send-message-to-channel.injectable.test.ts
rename to packages/technical-features/messaging/electron/main/src/send-message-to-channel/send-message-to-channel.injectable.test.ts
diff --git a/packages/technical-features/messaging/main/src/send-message-to-channel/send-message-to-channel.injectable.ts b/packages/technical-features/messaging/electron/main/src/send-message-to-channel/send-message-to-channel.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/main/src/send-message-to-channel/send-message-to-channel.injectable.ts
rename to packages/technical-features/messaging/electron/main/src/send-message-to-channel/send-message-to-channel.injectable.ts
diff --git a/packages/technical-features/messaging/main/tsconfig.json b/packages/technical-features/messaging/electron/main/tsconfig.json
similarity index 100%
rename from packages/technical-features/messaging/main/tsconfig.json
rename to packages/technical-features/messaging/electron/main/tsconfig.json
diff --git a/packages/technical-features/messaging/main/webpack.config.js b/packages/technical-features/messaging/electron/main/webpack.config.js
similarity index 100%
rename from packages/technical-features/messaging/main/webpack.config.js
rename to packages/technical-features/messaging/electron/main/webpack.config.js
diff --git a/packages/technical-features/messaging/renderer/.eslintrc.json b/packages/technical-features/messaging/electron/renderer/.eslintrc.json
similarity index 100%
rename from packages/technical-features/messaging/renderer/.eslintrc.json
rename to packages/technical-features/messaging/electron/renderer/.eslintrc.json
diff --git a/packages/technical-features/messaging/renderer/.prettierrc b/packages/technical-features/messaging/electron/renderer/.prettierrc
similarity index 100%
rename from packages/technical-features/messaging/renderer/.prettierrc
rename to packages/technical-features/messaging/electron/renderer/.prettierrc
diff --git a/packages/technical-features/messaging/renderer/index.ts b/packages/technical-features/messaging/electron/renderer/index.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/index.ts
rename to packages/technical-features/messaging/electron/renderer/index.ts
diff --git a/packages/technical-features/messaging/renderer/jest.config.js b/packages/technical-features/messaging/electron/renderer/jest.config.js
similarity index 100%
rename from packages/technical-features/messaging/renderer/jest.config.js
rename to packages/technical-features/messaging/electron/renderer/jest.config.js
diff --git a/packages/technical-features/messaging/renderer/package.json b/packages/technical-features/messaging/electron/renderer/package.json
similarity index 100%
rename from packages/technical-features/messaging/renderer/package.json
rename to packages/technical-features/messaging/electron/renderer/package.json
diff --git a/packages/technical-features/messaging/renderer/src/allow-communication-to-iframe.injectable.ts b/packages/technical-features/messaging/electron/renderer/src/allow-communication-to-iframe.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/allow-communication-to-iframe.injectable.ts
rename to packages/technical-features/messaging/electron/renderer/src/allow-communication-to-iframe.injectable.ts
diff --git a/packages/technical-features/messaging/renderer/src/allow-communication-to-iframe.test.ts b/packages/technical-features/messaging/electron/renderer/src/allow-communication-to-iframe.test.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/allow-communication-to-iframe.test.ts
rename to packages/technical-features/messaging/electron/renderer/src/allow-communication-to-iframe.test.ts
diff --git a/packages/technical-features/messaging/renderer/src/feature.ts b/packages/technical-features/messaging/electron/renderer/src/feature.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/feature.ts
rename to packages/technical-features/messaging/electron/renderer/src/feature.ts
diff --git a/packages/technical-features/messaging/renderer/src/ipc/ipc-renderer.injectable.ts b/packages/technical-features/messaging/electron/renderer/src/ipc/ipc-renderer.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/ipc/ipc-renderer.injectable.ts
rename to packages/technical-features/messaging/electron/renderer/src/ipc/ipc-renderer.injectable.ts
diff --git a/packages/technical-features/messaging/renderer/src/ipc/ipc-renderer.test.ts b/packages/technical-features/messaging/electron/renderer/src/ipc/ipc-renderer.test.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/ipc/ipc-renderer.test.ts
rename to packages/technical-features/messaging/electron/renderer/src/ipc/ipc-renderer.test.ts
diff --git a/packages/technical-features/messaging/renderer/src/listening-of-messages/enlist-message-channel-listener.injectable.ts b/packages/technical-features/messaging/electron/renderer/src/listening-of-messages/enlist-message-channel-listener.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/listening-of-messages/enlist-message-channel-listener.injectable.ts
rename to packages/technical-features/messaging/electron/renderer/src/listening-of-messages/enlist-message-channel-listener.injectable.ts
diff --git a/packages/technical-features/messaging/renderer/src/listening-of-messages/enlist-message-channel-listener.test.ts b/packages/technical-features/messaging/electron/renderer/src/listening-of-messages/enlist-message-channel-listener.test.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/listening-of-messages/enlist-message-channel-listener.test.ts
rename to packages/technical-features/messaging/electron/renderer/src/listening-of-messages/enlist-message-channel-listener.test.ts
diff --git a/packages/technical-features/messaging/renderer/src/listening-of-requests/enlist-request-channel-listener.injectable.ts b/packages/technical-features/messaging/electron/renderer/src/listening-of-requests/enlist-request-channel-listener.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/listening-of-requests/enlist-request-channel-listener.injectable.ts
rename to packages/technical-features/messaging/electron/renderer/src/listening-of-requests/enlist-request-channel-listener.injectable.ts
diff --git a/packages/technical-features/messaging/renderer/src/requesting-of-requests/invoke-ipc.injectable.ts b/packages/technical-features/messaging/electron/renderer/src/requesting-of-requests/invoke-ipc.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/requesting-of-requests/invoke-ipc.injectable.ts
rename to packages/technical-features/messaging/electron/renderer/src/requesting-of-requests/invoke-ipc.injectable.ts
diff --git a/packages/technical-features/messaging/renderer/src/requesting-of-requests/invoke-ipc.test.ts b/packages/technical-features/messaging/electron/renderer/src/requesting-of-requests/invoke-ipc.test.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/requesting-of-requests/invoke-ipc.test.ts
rename to packages/technical-features/messaging/electron/renderer/src/requesting-of-requests/invoke-ipc.test.ts
diff --git a/packages/technical-features/messaging/renderer/src/requesting-of-requests/request-from-channel.injectable.ts b/packages/technical-features/messaging/electron/renderer/src/requesting-of-requests/request-from-channel.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/requesting-of-requests/request-from-channel.injectable.ts
rename to packages/technical-features/messaging/electron/renderer/src/requesting-of-requests/request-from-channel.injectable.ts
diff --git a/packages/technical-features/messaging/renderer/src/requesting-of-requests/request-from-channel.test.ts b/packages/technical-features/messaging/electron/renderer/src/requesting-of-requests/request-from-channel.test.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/requesting-of-requests/request-from-channel.test.ts
rename to packages/technical-features/messaging/electron/renderer/src/requesting-of-requests/request-from-channel.test.ts
diff --git a/packages/technical-features/messaging/renderer/src/sending-of-messages/message-to-channel.injectable.ts b/packages/technical-features/messaging/electron/renderer/src/sending-of-messages/message-to-channel.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/sending-of-messages/message-to-channel.injectable.ts
rename to packages/technical-features/messaging/electron/renderer/src/sending-of-messages/message-to-channel.injectable.ts
diff --git a/packages/technical-features/messaging/renderer/src/sending-of-messages/message-to-channel.test.ts b/packages/technical-features/messaging/electron/renderer/src/sending-of-messages/message-to-channel.test.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/sending-of-messages/message-to-channel.test.ts
rename to packages/technical-features/messaging/electron/renderer/src/sending-of-messages/message-to-channel.test.ts
diff --git a/packages/technical-features/messaging/renderer/src/sending-of-messages/send-to-ipc.injectable.ts b/packages/technical-features/messaging/electron/renderer/src/sending-of-messages/send-to-ipc.injectable.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/sending-of-messages/send-to-ipc.injectable.ts
rename to packages/technical-features/messaging/electron/renderer/src/sending-of-messages/send-to-ipc.injectable.ts
diff --git a/packages/technical-features/messaging/renderer/src/sending-of-messages/send-to-ipc.test.ts b/packages/technical-features/messaging/electron/renderer/src/sending-of-messages/send-to-ipc.test.ts
similarity index 100%
rename from packages/technical-features/messaging/renderer/src/sending-of-messages/send-to-ipc.test.ts
rename to packages/technical-features/messaging/electron/renderer/src/sending-of-messages/send-to-ipc.test.ts
diff --git a/packages/technical-features/messaging/renderer/tsconfig.json b/packages/technical-features/messaging/electron/renderer/tsconfig.json
similarity index 100%
rename from packages/technical-features/messaging/renderer/tsconfig.json
rename to packages/technical-features/messaging/electron/renderer/tsconfig.json
diff --git a/packages/technical-features/messaging/renderer/webpack.config.js b/packages/technical-features/messaging/electron/renderer/webpack.config.js
similarity index 100%
rename from packages/technical-features/messaging/renderer/webpack.config.js
rename to packages/technical-features/messaging/electron/renderer/webpack.config.js