From 0e6e4fe54ca2b6733ae39cc99978b8cc2a0eb4bd Mon Sep 17 00:00:00 2001
From: Ilshat Sultanov <ilshat@sultanov.team>
Date: Fri, 6 May 2022 01:20:29 +0300
Subject: [PATCH] Split namespaces by builds

---
 .gitignore                                    |  6 +--
 package-lock.json                             | 16 +++---
 package.json                                  | 14 ++---
 public/index.html                             |  4 +-
 shadow-cljs.edn                               | 45 +++++++---------
 .../clojure/metaverse/{ => common}/env.cljs   |  4 +-
 .../clojure/metaverse/{ => common}/logger.clj |  2 +-
 .../metaverse/{ => common}/logger.cljs        |  4 +-
 .../{downloader => common}/reporter.cljs      | 20 +++----
 src/main/clojure/metaverse/common/rss.cljs    | 21 ++++++++
 .../metaverse/{ => common}/supabase.cljs      |  8 +--
 .../metaverse/{ => common}/utils/bean.cljs    |  7 ++-
 .../metaverse/{ => common}/utils/resource.clj |  2 +-
 .../metaverse/{ => common}/utils/string.cljs  |  2 +-
 .../metaverse/{ => common}/utils/transit.cljs |  2 +-
 src/main/clojure/metaverse/downloader.cljs    | 12 ++---
 .../clojure/metaverse/downloader/sentry.cljs  | 10 ++++
 src/main/clojure/metaverse/renderer.cljs      | 53 ++++++++++++++++++
 .../metaverse/{ui => renderer}/api.cljs       |  4 +-
 .../components/heroicons/outline.cljs         |  2 +-
 .../components/heroicons/solid.cljs           |  2 +-
 .../clojure/metaverse/renderer/config.cljs    |  1 +
 .../metaverse/{ui => renderer}/db.cljs        |  4 +-
 .../{ui => renderer}/pages/home.cljs          | 27 +++++-----
 .../metaverse/renderer/profile/core.cljs      |  3 ++
 .../{ui => renderer}/profile/subs.cljs        |  2 +-
 .../{ui => renderer}/router/core.cljs         |  8 +--
 .../{ui => renderer}/router/events.cljs       |  4 +-
 .../{ui => renderer}/router/subs.cljs         |  2 +-
 .../clojure/metaverse/renderer/sentry.cljs    | 10 ++++
 .../metaverse/{ui => renderer}/storage.cljs   | 10 ++--
 src/main/clojure/metaverse/rss.cljs           | 22 --------
 .../{runner/main.cljs => runner.cljs}         | 31 ++++++-----
 src/main/clojure/metaverse/runner/api.cljs    |  2 +-
 .../clojure/metaverse/runner/api/auth.cljs    |  4 +-
 src/main/clojure/metaverse/runner/config.cljs | 54 +++++++++----------
 .../metaverse/{ => runner}/electron.cljs      |  2 +-
 .../metaverse/{ => runner}/electron/app.cljs  |  4 +-
 .../{ => runner}/electron/dialog.cljs         |  4 +-
 .../metaverse/{ => runner}/electron/icon.cljs |  4 +-
 .../{ => runner}/electron/ipc_main.cljs       |  4 +-
 .../{ => runner}/electron/keyboard.cljs       |  4 +-
 .../metaverse/{ => runner}/electron/menu.cljs |  4 +-
 .../{ => runner}/electron/safe_storage.cljs   |  4 +-
 .../{ => runner}/electron/screen.cljs         |  4 +-
 .../{ => runner}/electron/store.cljs          |  4 +-
 .../metaverse/{ => runner}/electron/tray.cljs |  6 +--
 .../{ => runner}/electron/window.cljs         |  4 +-
 .../clojure/metaverse/runner/main/menu.cljs   |  8 +--
 .../clojure/metaverse/runner/main/tray.cljs   |  4 +-
 .../clojure/metaverse/runner/main/window.cljs |  4 +-
 src/main/clojure/metaverse/runner/path.cljs   |  2 +-
 .../clojure/metaverse/runner/reporter.cljs    | 34 ------------
 src/main/clojure/metaverse/runner/secret.cljs |  6 +--
 src/main/clojure/metaverse/runner/sentry.cljs | 10 ++++
 src/main/clojure/metaverse/runner/shell.cljs  |  2 +-
 .../metaverse/{ => runner}/utils/fs.cljs      |  2 +-
 .../metaverse/{ => runner}/utils/os.cljs      |  2 +-
 .../metaverse/{ => runner}/utils/path.cljs    |  2 +-
 .../metaverse/runner/utils/platform.cljs      |  5 ++
 .../clojure/metaverse/sentry/electron.cljs    | 12 -----
 src/main/clojure/metaverse/sentry/nodejs.cljs | 12 -----
 src/main/clojure/metaverse/ui/core.cljs       |  6 ---
 src/main/clojure/metaverse/ui/main.cljs       | 51 ------------------
 .../clojure/metaverse/ui/profile/core.cljs    |  3 --
 src/main/clojure/metaverse/utils/json.cljs    |  6 ---
 .../clojure/metaverse/utils/platform.cljs     |  5 --
 .../{ => common}/utils/transit_test.cljs      |  4 +-
 tailwind.config.js                            |  4 +-
 69 files changed, 307 insertions(+), 349 deletions(-)
 rename src/main/clojure/metaverse/{ => common}/env.cljs (88%)
 rename src/main/clojure/metaverse/{ => common}/logger.clj (93%)
 rename src/main/clojure/metaverse/{ => common}/logger.cljs (85%)
 rename src/main/clojure/metaverse/{downloader => common}/reporter.cljs (73%)
 create mode 100644 src/main/clojure/metaverse/common/rss.cljs
 rename src/main/clojure/metaverse/{ => common}/supabase.cljs (95%)
 rename src/main/clojure/metaverse/{ => common}/utils/bean.cljs (75%)
 rename src/main/clojure/metaverse/{ => common}/utils/resource.clj (84%)
 rename src/main/clojure/metaverse/{ => common}/utils/string.cljs (85%)
 rename src/main/clojure/metaverse/{ => common}/utils/transit.cljs (95%)
 create mode 100644 src/main/clojure/metaverse/downloader/sentry.cljs
 create mode 100644 src/main/clojure/metaverse/renderer.cljs
 rename src/main/clojure/metaverse/{ui => renderer}/api.cljs (89%)
 rename src/main/clojure/metaverse/{ui => renderer}/components/heroicons/outline.cljs (99%)
 rename src/main/clojure/metaverse/{ui => renderer}/components/heroicons/solid.cljs (99%)
 create mode 100644 src/main/clojure/metaverse/renderer/config.cljs
 rename src/main/clojure/metaverse/{ui => renderer}/db.cljs (96%)
 rename src/main/clojure/metaverse/{ui => renderer}/pages/home.cljs (87%)
 create mode 100644 src/main/clojure/metaverse/renderer/profile/core.cljs
 rename src/main/clojure/metaverse/{ui => renderer}/profile/subs.cljs (71%)
 rename src/main/clojure/metaverse/{ui => renderer}/router/core.cljs (88%)
 rename src/main/clojure/metaverse/{ui => renderer}/router/events.cljs (96%)
 rename src/main/clojure/metaverse/{ui => renderer}/router/subs.cljs (93%)
 create mode 100644 src/main/clojure/metaverse/renderer/sentry.cljs
 rename src/main/clojure/metaverse/{ui => renderer}/storage.cljs (83%)
 delete mode 100644 src/main/clojure/metaverse/rss.cljs
 rename src/main/clojure/metaverse/{runner/main.cljs => runner.cljs} (82%)
 rename src/main/clojure/metaverse/{ => runner}/electron.cljs (97%)
 rename src/main/clojure/metaverse/{ => runner}/electron/app.cljs (92%)
 rename src/main/clojure/metaverse/{ => runner}/electron/dialog.cljs (59%)
 rename src/main/clojure/metaverse/{ => runner}/electron/icon.cljs (67%)
 rename src/main/clojure/metaverse/{ => runner}/electron/ipc_main.cljs (85%)
 rename src/main/clojure/metaverse/{ => runner}/electron/keyboard.cljs (58%)
 rename src/main/clojure/metaverse/{ => runner}/electron/menu.cljs (69%)
 rename src/main/clojure/metaverse/{ => runner}/electron/safe_storage.cljs (88%)
 rename src/main/clojure/metaverse/{ => runner}/electron/screen.cljs (80%)
 rename src/main/clojure/metaverse/{ => runner}/electron/store.cljs (86%)
 rename src/main/clojure/metaverse/{ => runner}/electron/tray.cljs (82%)
 rename src/main/clojure/metaverse/{ => runner}/electron/window.cljs (94%)
 delete mode 100644 src/main/clojure/metaverse/runner/reporter.cljs
 create mode 100644 src/main/clojure/metaverse/runner/sentry.cljs
 rename src/main/clojure/metaverse/{ => runner}/utils/fs.cljs (95%)
 rename src/main/clojure/metaverse/{ => runner}/utils/os.cljs (88%)
 rename src/main/clojure/metaverse/{ => runner}/utils/path.cljs (85%)
 create mode 100644 src/main/clojure/metaverse/runner/utils/platform.cljs
 delete mode 100644 src/main/clojure/metaverse/sentry/electron.cljs
 delete mode 100644 src/main/clojure/metaverse/sentry/nodejs.cljs
 delete mode 100644 src/main/clojure/metaverse/ui/core.cljs
 delete mode 100644 src/main/clojure/metaverse/ui/main.cljs
 delete mode 100644 src/main/clojure/metaverse/ui/profile/core.cljs
 delete mode 100644 src/main/clojure/metaverse/utils/json.cljs
 delete mode 100644 src/main/clojure/metaverse/utils/platform.cljs
 rename src/test/clojure/metaverse/{ => common}/utils/transit_test.cljs (88%)

diff --git a/.gitignore b/.gitignore
index 56d02c2..26a7703 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,11 +16,11 @@ coverage
 dist
 design/backgrounds
 node_modules
-public/assets/js
 public/assets/styles
-public/test
 public/downloader.js
-public/main.js
+public/js
+public/runner.js
+public/test
 target
 build.edn
 *.iml
diff --git a/package-lock.json b/package-lock.json
index 81ebe08..aaa292f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@io.lazy-cat/metaverse",
-  "version": "0.1.206",
+  "version": "0.1.220",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@io.lazy-cat/metaverse",
-      "version": "0.1.206",
+      "version": "0.1.220",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -2158,9 +2158,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001335",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001335.tgz",
-      "integrity": "sha512-ddP1Tgm7z2iIxu6QTtbZUv6HJxSaV/PZeSrWFZtbY4JZ69tOeNhBCl3HyRQgeNZKE5AOn1kpV7fhljigy0Ty3w==",
+      "version": "1.0.30001336",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001336.tgz",
+      "integrity": "sha512-/YxSlBmL7iKXTbIJ48IQTnAOBk7XmWsxhBF1PZLOko5Dt9qc4Pl+84lfqG3Tc4EuavurRn1QLoVJGxY2iSycfw==",
       "dev": true,
       "funding": [
         {
@@ -11338,9 +11338,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001335",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001335.tgz",
-      "integrity": "sha512-ddP1Tgm7z2iIxu6QTtbZUv6HJxSaV/PZeSrWFZtbY4JZ69tOeNhBCl3HyRQgeNZKE5AOn1kpV7fhljigy0Ty3w==",
+      "version": "1.0.30001336",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001336.tgz",
+      "integrity": "sha512-/YxSlBmL7iKXTbIJ48IQTnAOBk7XmWsxhBF1PZLOko5Dt9qc4Pl+84lfqG3Tc4EuavurRn1QLoVJGxY2iSycfw==",
       "dev": true
     },
     "chalk": {
diff --git a/package.json b/package.json
index d34d5c7..b84fb3d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@io.lazy-cat/metaverse",
-  "version": "0.1.206",
+  "version": "0.1.220",
   "description": "The Metaverse of Clojurians",
   "license": "MIT",
   "author": "Ilshat Sultanov <ilshat@sultanov.team>",
@@ -27,21 +27,21 @@
     "reagent",
     "shadow-cljs"
   ],
-  "main": "public/main.js",
+  "main": "public/runner.js",
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
     "assets:icon:build": "electron-icon-builder -i public/assets/images/icon.png -o public/assets",
-    "assets:runner:clean": "rm -rf public/main.js",
+    "assets:runner:clean": "rm -rf public/runner.js",
     "assets:downloader:clean": "rm -rf public/downloader.js",
-    "assets:app:clean": "rm -rf public/assets/js && rm -rf public/test",
-    "assets:clean": "rm -rf public/assets/styles/bundle.css && npm run assets:runner:clean && npm run assets:downloader:clean && npm run assets:app:clean",
+    "assets:renderer:clean": "rm -rf public/js && rm -rf public/test",
+    "assets:clean": "rm -rf public/assets/styles/bundle.css && npm run assets:runner:clean && npm run assets:downloader:clean && npm run assets:renderer:clean",
     "assets:watch": "npx cross-env TAILWIND_MODE=watch postcss src/main/css/index.css --output public/assets/styles/bundle.css --verbose --watch",
     "assets:build": "npm run assets:icon:build && npx cross-env NODE_ENV=production postcss src/main/css/index.css --output public/assets/styles/bundle.css --verbose",
     "electron:clean": "rm -rf dist",
     "electron:watch": "npx electron .",
     "electron:build": "electron-builder build",
-    "shadow:watch": "npx shadow-cljs watch runner downloader app test",
-    "shadow:build": "npx shadow-cljs release runner downloader app",
+    "shadow:watch": "npx shadow-cljs watch runner downloader renderer test",
+    "shadow:build": "npx shadow-cljs release runner downloader renderer",
     "test:build": "npx shadow-cljs compile ci",
     "test:run": "npx karma start karma.config.js --single-run",
     "clean": "npm run electron:clean && npm run assets:clean",
diff --git a/public/index.html b/public/index.html
index b77fb5c..ddc0be8 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -8,7 +8,7 @@
   <body>
     <div id="root"></div>
     <noscript>You need to enable JavaScript to run this app.</noscript>
-    <script src="assets/js/main.js"></script>
+    <script src="js/renderer.js"></script>
     <script>
       if (
         localStorage.theme === "dark" ||
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
index 7be9735..63b0369 100644
--- a/shadow-cljs.edn
+++ b/shadow-cljs.edn
@@ -5,56 +5,47 @@
  :dev-http       {3000 "public/"
                   3001 "public/test/"}
 
- :build-defaults {:closure-defines  {goog.DEBUG                        true
-                                     metaverse.env/sentry-dsn          #shadow/env "METAVERSE_SENTRY_DSN"
-                                     metaverse.env/supabase-url        #shadow/env "METAVERSE_SUPABASE_URL"
-                                     metaverse.env/supabase-public-key #shadow/env "METAVERSE_SUPABASE_PUBLIC_KEY"}
-
+ :build-defaults {:closure-defines  {goog.DEBUG                               true
+                                     metaverse.common.env/sentry-dsn          #shadow/env "METAVERSE_SENTRY_DSN"
+                                     metaverse.common.env/supabase-url        #shadow/env "METAVERSE_SUPABASE_URL"
+                                     metaverse.common.env/supabase-public-key #shadow/env "METAVERSE_SUPABASE_PUBLIC_KEY"}
                   :compiler-options {:output-feature-set :es-next}}
 
  :builds         {:runner     {:target    :node-script
-                               :output-to "public/main.js"
-                               :main      metaverse.runner.main/init!
-
+                               :output-to "public/runner.js"
+                               :main      metaverse.runner/-main
                                :dev       {:compiler-options {:closure-defines {re-frame.trace/trace-enabled?        true
                                                                                 day8.re-frame.tracing/trace-enabled? true
-                                                                                metaverse.env/mode                   "develop"
-                                                                                metaverse.env/logger-level           "trace"}}}}
+                                                                                metaverse.common.env/mode            "develop"
+                                                                                metaverse.common.env/logger-level    "trace"}}}}
 
                   :downloader {:target    :node-script
                                :output-to "public/downloader.js"
-                               :main      metaverse.downloader/init!
-
+                               :main      metaverse.downloader/-main
                                :dev       {:compiler-options {:closure-defines {re-frame.trace/trace-enabled?        true
                                                                                 day8.re-frame.tracing/trace-enabled? true
-                                                                                metaverse.env/mode                   "develop"
-                                                                                metaverse.env/logger-level           "trace"}}}}
+                                                                                metaverse.common.env/mode            "develop"
+                                                                                metaverse.common.env/logger-level    "trace"}}}}
 
-                  :app        {:target     :browser
-                               :output-dir "public/assets/js"
+                  :renderer   {:target     :browser
+                               :output-dir "public/js"
                                :asset-path "js"
-
-                               :modules    {:main {:init-fn metaverse.ui.main/init!}}
-
+                               :modules    {:renderer {:init-fn metaverse.renderer/-main}}
                                :devtools   {:preloads [devtools.preload
                                                        day8.re-frame-10x.preload]}
-
                                :dev        {:compiler-options {:closure-defines {re-frame.trace/trace-enabled?        true
                                                                                  day8.re-frame.tracing/trace-enabled? true
-                                                                                 metaverse.env/mode                   "develop"
-                                                                                 metaverse.env/logger-level           "trace"}}}
-
+                                                                                 metaverse.common.env/mode            "develop"
+                                                                                 metaverse.common.env/logger-level    "trace"}}}
                                :release    {}}
 
                   :test       {:target   :browser-test
                                :test-dir "public/test"
-
                                :devtools {}
-
                                :dev      {:compiler-options {:closure-defines {re-frame.trace/trace-enabled?        true
                                                                                day8.re-frame.tracing/trace-enabled? true
-                                                                               metaverse.env/mode                   "develop"
-                                                                               metaverse.env/logger-level           "trace"}}}}
+                                                                               metaverse.common.env/mode            "develop"
+                                                                               metaverse.common.env/logger-level    "trace"}}}}
 
                   :ci         {:target    :karma
                                :output-to "public/test/assets/ci.js"}}}
diff --git a/src/main/clojure/metaverse/env.cljs b/src/main/clojure/metaverse/common/env.cljs
similarity index 88%
rename from src/main/clojure/metaverse/env.cljs
rename to src/main/clojure/metaverse/common/env.cljs
index e9df59b..180befd 100644
--- a/src/main/clojure/metaverse/env.cljs
+++ b/src/main/clojure/metaverse/common/env.cljs
@@ -1,9 +1,9 @@
-(ns metaverse.env
+(ns metaverse.common.env
   (:require
     [cljs.reader :as reader]
     [clojure.string :as str])
   (:require-macros
-    [metaverse.utils.resource :as resource]))
+    [metaverse.common.utils.resource :as resource]))
 
 
 (goog-define company-name "io.lazy-cat")
diff --git a/src/main/clojure/metaverse/logger.clj b/src/main/clojure/metaverse/common/logger.clj
similarity index 93%
rename from src/main/clojure/metaverse/logger.clj
rename to src/main/clojure/metaverse/common/logger.clj
index cc0affd..beac575 100644
--- a/src/main/clojure/metaverse/logger.clj
+++ b/src/main/clojure/metaverse/common/logger.clj
@@ -1,4 +1,4 @@
-(ns metaverse.logger
+(ns metaverse.common.logger
   (:require
     [lambdaisland.glogi :as log]))
 
diff --git a/src/main/clojure/metaverse/logger.cljs b/src/main/clojure/metaverse/common/logger.cljs
similarity index 85%
rename from src/main/clojure/metaverse/logger.cljs
rename to src/main/clojure/metaverse/common/logger.cljs
index 0a2c86c..073f37e 100644
--- a/src/main/clojure/metaverse/logger.cljs
+++ b/src/main/clojure/metaverse/common/logger.cljs
@@ -1,8 +1,8 @@
-(ns metaverse.logger
+(ns metaverse.common.logger
   (:require
     [lambdaisland.glogi :as log]
     [lambdaisland.glogi.console :as console]
-    [metaverse.env :as env]))
+    [metaverse.common.env :as env]))
 
 
 (defn init!
diff --git a/src/main/clojure/metaverse/downloader/reporter.cljs b/src/main/clojure/metaverse/common/reporter.cljs
similarity index 73%
rename from src/main/clojure/metaverse/downloader/reporter.cljs
rename to src/main/clojure/metaverse/common/reporter.cljs
index 6b341e5..b792022 100644
--- a/src/main/clojure/metaverse/downloader/reporter.cljs
+++ b/src/main/clojure/metaverse/common/reporter.cljs
@@ -1,18 +1,17 @@
-(ns metaverse.downloader.reporter
+(ns metaverse.common.reporter
   (:require
-    [metaverse.env :as env]
-    [metaverse.logger :as log :include-macros true]
-    [metaverse.sentry.nodejs :as sentry]
-    [metaverse.utils.string :as str]
+    [metaverse.common.env :as env]
+    [metaverse.common.logger :as log :include-macros true]
+    [metaverse.common.utils.string :as str]
     [tenet.response :as r]))
 
 
 ;; TODO: [2022-05-02, ilshat@sultanov.team] validate opts
 
 (defn init!
-  ([]
-   (init! {}))
-  ([{:keys [dsn] :as opts}]
+  ([^js sentry]
+   (init! sentry {}))
+  ([^js sentry {:keys [dsn] :as opts}]
    (let [dsn (or dsn env/sentry-dsn)]
      (if (= "N/A" dsn)
        (do
@@ -28,7 +27,8 @@
                            :debug            env/develop?
                            :release          (str/format "%s@%s:%s" env/company-name env/product-name version)
                            :initialScope     {:build build}}
-                          (merge opts))
-             reporter (sentry/init! opts')]
+                          (merge opts)
+                          (clj->js))
+             reporter (.init sentry opts')]
          (log/info :msg "Sentry reporter successfully initialized" :opts opts')
          (r/as-success reporter))))))
diff --git a/src/main/clojure/metaverse/common/rss.cljs b/src/main/clojure/metaverse/common/rss.cljs
new file mode 100644
index 0000000..1124f4d
--- /dev/null
+++ b/src/main/clojure/metaverse/common/rss.cljs
@@ -0,0 +1,21 @@
+(ns metaverse.common.rss
+  (:require
+    ["feed-reader" :rename {read get-feed}]
+    [metaverse.common.logger :as log :include-macros true]
+    [tenet.response :as r]))
+
+
+(defn fetch
+  ([url]
+   (fetch url {}))
+  ([url {:keys [on-success on-failure]
+         :or   {on-success identity
+                on-failure identity}}]
+   (log/debug :msg "RSS feed downloading has started" :url url)
+   (-> (get-feed url)
+       (.then (fn [response]
+                (log/debug :msg "RSS feed was downloaded successfully" :url url)
+                (on-success (r/as-success response))))
+       (.catch (fn [error]
+                 (log/error :msg "RSS feed was downloaded with an error" :url url :error error)
+                 (on-failure (r/as-error error)))))))
diff --git a/src/main/clojure/metaverse/supabase.cljs b/src/main/clojure/metaverse/common/supabase.cljs
similarity index 95%
rename from src/main/clojure/metaverse/supabase.cljs
rename to src/main/clojure/metaverse/common/supabase.cljs
index e67f595..7ea5b5d 100644
--- a/src/main/clojure/metaverse/supabase.cljs
+++ b/src/main/clojure/metaverse/common/supabase.cljs
@@ -1,10 +1,10 @@
-(ns metaverse.supabase
+(ns metaverse.common.supabase
   (:require
     ["@supabase/supabase-js" :as supabase]
     [applied-science.js-interop :as j]
-    [metaverse.env :as env]
-    [metaverse.logger :as log :include-macros true]
-    [metaverse.utils.bean :as b]
+    [metaverse.common.env :as env]
+    [metaverse.common.logger :as log :include-macros true]
+    [metaverse.common.utils.bean :as b]
     [tenet.response :as r]))
 
 
diff --git a/src/main/clojure/metaverse/utils/bean.cljs b/src/main/clojure/metaverse/common/utils/bean.cljs
similarity index 75%
rename from src/main/clojure/metaverse/utils/bean.cljs
rename to src/main/clojure/metaverse/common/utils/bean.cljs
index caadfee..0b47040 100644
--- a/src/main/clojure/metaverse/utils/bean.cljs
+++ b/src/main/clojure/metaverse/common/utils/bean.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.utils.bean
+(ns metaverse.common.utils.bean
   (:require
     [cljs-bean.core :as b]))
 
@@ -8,6 +8,11 @@
   (b/->js x))
 
 
+(defn ->clj
+  [x]
+  (b/->clj x))
+
+
 (defn bean
   [^js x]
   (when (some? x)
diff --git a/src/main/clojure/metaverse/utils/resource.clj b/src/main/clojure/metaverse/common/utils/resource.clj
similarity index 84%
rename from src/main/clojure/metaverse/utils/resource.clj
rename to src/main/clojure/metaverse/common/utils/resource.clj
index 18e85fb..cb1d835 100644
--- a/src/main/clojure/metaverse/utils/resource.clj
+++ b/src/main/clojure/metaverse/common/utils/resource.clj
@@ -1,4 +1,4 @@
-(ns metaverse.utils.resource
+(ns metaverse.common.utils.resource
   (:refer-clojure :exclude [slurp])
   (:require
     [clojure.core :as c]
diff --git a/src/main/clojure/metaverse/utils/string.cljs b/src/main/clojure/metaverse/common/utils/string.cljs
similarity index 85%
rename from src/main/clojure/metaverse/utils/string.cljs
rename to src/main/clojure/metaverse/common/utils/string.cljs
index bca7742..e516757 100644
--- a/src/main/clojure/metaverse/utils/string.cljs
+++ b/src/main/clojure/metaverse/common/utils/string.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.utils.string
+(ns metaverse.common.utils.string
   (:require
     [goog.string :as gstr]
     [goog.string.format]))
diff --git a/src/main/clojure/metaverse/utils/transit.cljs b/src/main/clojure/metaverse/common/utils/transit.cljs
similarity index 95%
rename from src/main/clojure/metaverse/utils/transit.cljs
rename to src/main/clojure/metaverse/common/utils/transit.cljs
index 86e4687..792edbd 100644
--- a/src/main/clojure/metaverse/utils/transit.cljs
+++ b/src/main/clojure/metaverse/common/utils/transit.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.utils.transit
+(ns metaverse.common.utils.transit
   (:require
     [cljs-bean.transit :as bt]
     [cognitect.transit :as t]
diff --git a/src/main/clojure/metaverse/downloader.cljs b/src/main/clojure/metaverse/downloader.cljs
index f54cce8..dd81ea3 100644
--- a/src/main/clojure/metaverse/downloader.cljs
+++ b/src/main/clojure/metaverse/downloader.cljs
@@ -1,19 +1,19 @@
 (ns metaverse.downloader
   (:require
-    [metaverse.downloader.reporter :as reporter]
-    [metaverse.logger :as log]
-    [metaverse.supabase :as supabase]))
+    [metaverse.common.logger :as log]
+    [metaverse.common.supabase :as supabase]
+    [metaverse.downloader.sentry :as sentry]))
 
 
 (defn setup-tools
   []
   (log/init!)
-  (reporter/init!)
+  (sentry/init!)
   (supabase/init!))
 
 
-(defn init!
-  "Downloader initializer."
+(defn -main
+  "Downloader entry point."
   {:export true}
   [& _args]
   (setup-tools)
diff --git a/src/main/clojure/metaverse/downloader/sentry.cljs b/src/main/clojure/metaverse/downloader/sentry.cljs
new file mode 100644
index 0000000..5cca0a8
--- /dev/null
+++ b/src/main/clojure/metaverse/downloader/sentry.cljs
@@ -0,0 +1,10 @@
+(ns metaverse.downloader.sentry
+  (:require
+    ["@sentry/node" :as sentry]
+    ["@sentry/tracing"]
+    [metaverse.common.reporter :as reporter]))
+
+
+(defn init!
+  []
+  (reporter/init! sentry))
diff --git a/src/main/clojure/metaverse/renderer.cljs b/src/main/clojure/metaverse/renderer.cljs
new file mode 100644
index 0000000..d00e003
--- /dev/null
+++ b/src/main/clojure/metaverse/renderer.cljs
@@ -0,0 +1,53 @@
+(ns metaverse.renderer
+  (:require
+    [goog.dom :as gdom]
+    [metaverse.common.logger :as log]
+    [metaverse.common.utils.transit :as t]
+    [metaverse.renderer.db :as db]
+    [metaverse.renderer.pages.home :as home]
+    [metaverse.renderer.router.core :as router]
+    [metaverse.renderer.storage]
+    [re-frame.core :as rf]
+    [reagent.core :as r]
+    [reagent.dom :as dom]))
+
+
+(defn setup-tools
+  "Setup tools."
+  []
+  (log/init!))
+
+
+;; metaverse://app#access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJhdXRoZW50aWNhdGVkIiwiZXhwIjoxNjUxNzA2NDU2LCJzdWIiOiI2ODQ1NGNiNS04YWY2LTQ0MDctYmMzMC1mM2Y2YmQwZTUyZDAiLCJlbWFpbCI6Imlsc2hhdEBzdWx0YW5vdi50ZWFtIiwicGhvbmUiOiIiLCJhcHBfbWV0YWRhdGEiOnsicHJvdmlkZXIiOiJnaXRodWIiLCJwcm92aWRlcnMiOlsiZ2l0aHViIl19LCJ1c2VyX21ldGFkYXRhIjp7ImF2YXRhcl91cmwiOiJodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvNjUwMTMyOT92PTQiLCJlbWFpbCI6Imlsc2hhdEBzdWx0YW5vdi50ZWFtIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImZ1bGxfbmFtZSI6Iklsc2hhdCBTdWx0YW5vdiIsImlzcyI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20iLCJuYW1lIjoiSWxzaGF0IFN1bHRhbm92IiwicHJlZmVycmVkX3VzZXJuYW1lIjoianVzdC1zdWx0YW5vdiIsInByb3ZpZGVyX2lkIjoiNjUwMTMyOSIsInN1YiI6IjY1MDEzMjkiLCJ1c2VyX25hbWUiOiJqdXN0LXN1bHRhbm92In0sInJvbGUiOiJhdXRoZW50aWNhdGVkIn0.OjB6BnL4b0J9CuUAxa-8fTOuF7wLsEfMf6noEIPS0XI&expires_in=3600&provider_token=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&refresh_token=c19pEgrEeBzi5saIJ2AiNQ&token_type=bearer
+
+(defn root
+  []
+  (let [did-mount (fn [_]
+                    (.. js/window -bridge
+                        (dispatch (fn [_ipc-event event]
+                                    (let [event (t/read event)]
+                                      (rf/dispatch @event))))))]
+    (r/create-class
+      {:display-name        "root"
+       :component-did-mount did-mount
+       :reagent-render      (fn []
+                              [home/page])})))
+
+
+(defn mount-root
+  "Mount root component."
+  {:dev/after-load true}
+  []
+  (when-some [root-elem (gdom/getElement "root")]
+    (rf/clear-subscription-cache!)
+    (router/init!)
+    (dom/render [root] root-elem)))
+
+
+(defn -main
+  "Renderer entry point."
+  {:export true}
+  [& _args]
+  (setup-tools)
+  (rf/dispatch-sync [::db/init])
+  (mount-root))
diff --git a/src/main/clojure/metaverse/ui/api.cljs b/src/main/clojure/metaverse/renderer/api.cljs
similarity index 89%
rename from src/main/clojure/metaverse/ui/api.cljs
rename to src/main/clojure/metaverse/renderer/api.cljs
index 0f74875..1adbc72 100644
--- a/src/main/clojure/metaverse/ui/api.cljs
+++ b/src/main/clojure/metaverse/renderer/api.cljs
@@ -1,6 +1,6 @@
-(ns metaverse.ui.api
+(ns metaverse.renderer.api
   (:require
-    [metaverse.utils.transit :as t]
+    [metaverse.common.utils.transit :as t]
     [re-frame.core :as rf]
     [tenet.response :as r]))
 
diff --git a/src/main/clojure/metaverse/ui/components/heroicons/outline.cljs b/src/main/clojure/metaverse/renderer/components/heroicons/outline.cljs
similarity index 99%
rename from src/main/clojure/metaverse/ui/components/heroicons/outline.cljs
rename to src/main/clojure/metaverse/renderer/components/heroicons/outline.cljs
index 1ea74d3..beea2b8 100644
--- a/src/main/clojure/metaverse/ui/components/heroicons/outline.cljs
+++ b/src/main/clojure/metaverse/renderer/components/heroicons/outline.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.ui.components.heroicons.outline
+(ns metaverse.renderer.components.heroicons.outline
   (:require
     ["@heroicons/react/outline/esm" :as outline]))
 
diff --git a/src/main/clojure/metaverse/ui/components/heroicons/solid.cljs b/src/main/clojure/metaverse/renderer/components/heroicons/solid.cljs
similarity index 99%
rename from src/main/clojure/metaverse/ui/components/heroicons/solid.cljs
rename to src/main/clojure/metaverse/renderer/components/heroicons/solid.cljs
index 42d4548..d8ede99 100644
--- a/src/main/clojure/metaverse/ui/components/heroicons/solid.cljs
+++ b/src/main/clojure/metaverse/renderer/components/heroicons/solid.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.ui.components.heroicons.solid
+(ns metaverse.renderer.components.heroicons.solid
   (:require
     ["@heroicons/react/solid/esm" :as solid]))
 
diff --git a/src/main/clojure/metaverse/renderer/config.cljs b/src/main/clojure/metaverse/renderer/config.cljs
new file mode 100644
index 0000000..745433d
--- /dev/null
+++ b/src/main/clojure/metaverse/renderer/config.cljs
@@ -0,0 +1 @@
+(ns metaverse.renderer.config)
diff --git a/src/main/clojure/metaverse/ui/db.cljs b/src/main/clojure/metaverse/renderer/db.cljs
similarity index 96%
rename from src/main/clojure/metaverse/ui/db.cljs
rename to src/main/clojure/metaverse/renderer/db.cljs
index 1ac251c..d33815b 100644
--- a/src/main/clojure/metaverse/ui/db.cljs
+++ b/src/main/clojure/metaverse/renderer/db.cljs
@@ -1,7 +1,7 @@
-(ns metaverse.ui.db
+(ns metaverse.renderer.db
   (:require
     [day8.re-frame.tracing :refer-macros [fn-traced]]
-    [metaverse.ui.profile.core]
+    [metaverse.renderer.profile.core]
     [re-frame.core :as rf]))
 
 
diff --git a/src/main/clojure/metaverse/ui/pages/home.cljs b/src/main/clojure/metaverse/renderer/pages/home.cljs
similarity index 87%
rename from src/main/clojure/metaverse/ui/pages/home.cljs
rename to src/main/clojure/metaverse/renderer/pages/home.cljs
index 98bf005..90faf41 100644
--- a/src/main/clojure/metaverse/ui/pages/home.cljs
+++ b/src/main/clojure/metaverse/renderer/pages/home.cljs
@@ -1,7 +1,7 @@
-(ns metaverse.ui.pages.home
+(ns metaverse.renderer.pages.home
   (:require
-    [metaverse.ui.api]
-    [metaverse.ui.components.heroicons.outline :as icons]
+    [metaverse.renderer.api]
+    [metaverse.renderer.components.heroicons.outline :as icons]
     [re-frame.core :as rf]))
 
 
@@ -74,31 +74,29 @@
   ::sign-in->success
   (fn [_ [_ res]]
     (js/console.log "sign-in->success" (pr-str res))
-    (js/alert (pr-str res))
-    {:local-storage/set-item [:metaverse/user res]}))
+    {:local-storage/set-item [:metaverse/user res]
+     :api/send               [:open-url (:url @res)]}))
 
 
 (rf/reg-event-fx
   ::sign-in->failure
   (fn [_ [_ res]]
     (js/console.log "sign-in->failure" (pr-str res))
-    (js/alert (pr-str res))
     {:local-storage/remove-item [:metaverse/user]}))
 
 
 (rf/reg-event-fx
   ::sign-in
   (fn [_ [_ opts]]
-    {:api/dispatch {:event      [:auth/sign-in opts]
-                    :on-success [::sign-in->success]
-                    :on-failure [::sign-in->failure]}}))
+    {:api/invoke {:event      [:auth/sign-in opts]
+                  :on-success [::sign-in->success]
+                  :on-failure [::sign-in->failure]}}))
 
 
 (rf/reg-event-fx
   ::sign-out->success
   (fn [_ [_ res]]
     (js/console.log "sign-out->success" (pr-str res))
-    (js/alert (pr-str res))
     {:local-storage/remove-item :metaverse/user}))
 
 
@@ -106,16 +104,15 @@
   ::sign-out->failure
   (fn [_ [_ res]]
     (js/console.log "sign-out->failure" (pr-str res))
-    (js/alert (pr-str res))
     {:local-storage/remove-item :metaverse/user}))
 
 
 (rf/reg-event-fx
   ::sign-out
   (fn [_ [_ opts]]
-    {:api/dispatch {:event      [:auth/sign-out opts]
-                    :on-success [::sign-out->success]
-                    :on-failure [::sign-out->failure]}}))
+    {:api/invoke {:event      [:auth/sign-out opts]
+                  :on-success [::sign-out->success]
+                  :on-failure [::sign-out->failure]}}))
 
 
 
@@ -126,7 +123,7 @@
    [navbar route-name]
    [search]
 
-   [:div..grid-row-1.col-span-full {:style {:border "0px solid yellow"}}
+   [:div.grid-row-1.col-span-full {:style {:border "0px solid yellow"}}
     [:div.grid.grid-cols-2.gap-2 {:style {:border "0px solid magenta"}}
      [:div.flex.justify-start.gap-2]
      [:div.flex.justify-end.gap-2
diff --git a/src/main/clojure/metaverse/renderer/profile/core.cljs b/src/main/clojure/metaverse/renderer/profile/core.cljs
new file mode 100644
index 0000000..9546d69
--- /dev/null
+++ b/src/main/clojure/metaverse/renderer/profile/core.cljs
@@ -0,0 +1,3 @@
+(ns metaverse.renderer.profile.core
+  (:require
+    [metaverse.renderer.profile.subs]))
diff --git a/src/main/clojure/metaverse/ui/profile/subs.cljs b/src/main/clojure/metaverse/renderer/profile/subs.cljs
similarity index 71%
rename from src/main/clojure/metaverse/ui/profile/subs.cljs
rename to src/main/clojure/metaverse/renderer/profile/subs.cljs
index d1e4eeb..716d884 100644
--- a/src/main/clojure/metaverse/ui/profile/subs.cljs
+++ b/src/main/clojure/metaverse/renderer/profile/subs.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.ui.profile.subs
+(ns metaverse.renderer.profile.subs
   (:require
     [re-frame.core :as rf]))
 
diff --git a/src/main/clojure/metaverse/ui/router/core.cljs b/src/main/clojure/metaverse/renderer/router/core.cljs
similarity index 88%
rename from src/main/clojure/metaverse/ui/router/core.cljs
rename to src/main/clojure/metaverse/renderer/router/core.cljs
index dbb8027..f0500ff 100644
--- a/src/main/clojure/metaverse/ui/router/core.cljs
+++ b/src/main/clojure/metaverse/renderer/router/core.cljs
@@ -1,8 +1,8 @@
-(ns metaverse.ui.router.core
+(ns metaverse.renderer.router.core
   (:require
-    [metaverse.logger :as log :include-macros true]
-    [metaverse.ui.router.events]
-    [metaverse.ui.router.subs]
+    [metaverse.common.logger :as log :include-macros true]
+    [metaverse.renderer.router.events]
+    [metaverse.renderer.router.subs]
     [re-frame.core :as rf]
     [reitit.coercion.malli :as rcm]
     [reitit.frontend :as rfr]
diff --git a/src/main/clojure/metaverse/ui/router/events.cljs b/src/main/clojure/metaverse/renderer/router/events.cljs
similarity index 96%
rename from src/main/clojure/metaverse/ui/router/events.cljs
rename to src/main/clojure/metaverse/renderer/router/events.cljs
index 0543cf7..84bec49 100644
--- a/src/main/clojure/metaverse/ui/router/events.cljs
+++ b/src/main/clojure/metaverse/renderer/router/events.cljs
@@ -1,7 +1,7 @@
-(ns metaverse.ui.router.events
+(ns metaverse.renderer.router.events
   (:require
     [day8.re-frame.tracing :refer-macros [fn-traced]]
-    [metaverse.logger :as log :include-macros true]
+    [metaverse.common.logger :as log :include-macros true]
     [re-frame.core :as rf]
     [reitit.frontend.controllers :as rfc]
     [reitit.frontend.easy :as rfe]))
diff --git a/src/main/clojure/metaverse/ui/router/subs.cljs b/src/main/clojure/metaverse/renderer/router/subs.cljs
similarity index 93%
rename from src/main/clojure/metaverse/ui/router/subs.cljs
rename to src/main/clojure/metaverse/renderer/router/subs.cljs
index 63a1ec2..eeab449 100644
--- a/src/main/clojure/metaverse/ui/router/subs.cljs
+++ b/src/main/clojure/metaverse/renderer/router/subs.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.ui.router.subs
+(ns metaverse.renderer.router.subs
   (:require
     [re-frame.core :as rf]
     [reitit.frontend.easy :as rfe]))
diff --git a/src/main/clojure/metaverse/renderer/sentry.cljs b/src/main/clojure/metaverse/renderer/sentry.cljs
new file mode 100644
index 0000000..df17d39
--- /dev/null
+++ b/src/main/clojure/metaverse/renderer/sentry.cljs
@@ -0,0 +1,10 @@
+(ns metaverse.renderer.sentry
+  (:require
+    ["@sentry/node" :as sentry]
+    ["@sentry/tracing"]
+    [metaverse.common.reporter :as reporter]))
+
+
+(defn init!
+  []
+  (reporter/init! sentry))
diff --git a/src/main/clojure/metaverse/ui/storage.cljs b/src/main/clojure/metaverse/renderer/storage.cljs
similarity index 83%
rename from src/main/clojure/metaverse/ui/storage.cljs
rename to src/main/clojure/metaverse/renderer/storage.cljs
index 5c40aba..580e2b2 100644
--- a/src/main/clojure/metaverse/ui/storage.cljs
+++ b/src/main/clojure/metaverse/renderer/storage.cljs
@@ -1,14 +1,14 @@
-(ns metaverse.ui.storage
+(ns metaverse.renderer.storage
   (:require
-    [cljs-bean.core :as bean]
-    [metaverse.utils.string :refer [keyword->string]]
+    [metaverse.common.utils.bean :as b]
+    [metaverse.common.utils.string :refer [keyword->string]]
     [re-frame.core :as rf]))
 
 
 (defn set-item!
   [key item]
   (when-some [key (keyword->string key)]
-    (let [item (.stringify js/JSON (bean/->js item))]
+    (let [item (.stringify js/JSON (b/->js item))]
       (.setItem js/localStorage key item))))
 
 
@@ -22,7 +22,7 @@
   [key]
   (when-some [key (keyword->string key)]
     (let [item (.getItem js/localStorage key)]
-      (bean/->clj (.parse js/JSON item)))))
+      (b/->clj (.parse js/JSON item)))))
 
 
 (defn get-items
diff --git a/src/main/clojure/metaverse/rss.cljs b/src/main/clojure/metaverse/rss.cljs
deleted file mode 100644
index 922840e..0000000
--- a/src/main/clojure/metaverse/rss.cljs
+++ /dev/null
@@ -1,22 +0,0 @@
-(ns metaverse.rss
-  (:require
-    ["feed-reader" :rename {read get-feed}]
-    [metaverse.logger :as log :include-macros true]
-    [promesa.core :as p]
-    [tenet.response :as r]))
-
-
-(defn fetch
-  ([url]
-   (fetch url {}))
-  ([url {:keys [on-success on-failure]
-         :or   {on-success identity
-                on-failure identity}}]
-   (log/debug :msg "RSS feed downloading has started" :url url)
-   (-> (get-feed url)
-       (p/then (fn [response]
-                 (log/debug :msg "RSS feed was downloaded successfully" :url url)
-                 (on-success (r/as-success response))))
-       (p/catch (fn [error]
-                  (log/error :msg "RSS feed was downloaded with an error" :url url :error error)
-                  (on-failure (r/as-error error)))))))
diff --git a/src/main/clojure/metaverse/runner/main.cljs b/src/main/clojure/metaverse/runner.cljs
similarity index 82%
rename from src/main/clojure/metaverse/runner/main.cljs
rename to src/main/clojure/metaverse/runner.cljs
index 3b793d0..541577d 100644
--- a/src/main/clojure/metaverse/runner/main.cljs
+++ b/src/main/clojure/metaverse/runner.cljs
@@ -1,22 +1,22 @@
-(ns metaverse.runner.main
+(ns metaverse.runner
   (:require
     [clojure.string :as str]
-    [metaverse.electron.app :as app]
-    [metaverse.electron.ipc-main :as ipc-main]
-    [metaverse.electron.menu :as menu]
-    [metaverse.electron.tray :as tray]
-    [metaverse.electron.window :as window]
-    [metaverse.logger :as log :include-macros true]
+    [metaverse.common.logger :as log :include-macros true]
+    [metaverse.common.supabase :as supabase]
+    [metaverse.common.utils.transit :as t]
     [metaverse.runner.api :as api]
     [metaverse.runner.api.auth]
     [metaverse.runner.config :as config]
+    [metaverse.runner.electron.app :as app]
+    [metaverse.runner.electron.ipc-main :as ipc-main]
+    [metaverse.runner.electron.menu :as menu]
+    [metaverse.runner.electron.tray :as tray]
+    [metaverse.runner.electron.window :as window]
     [metaverse.runner.main.menu :as main.menu]
     [metaverse.runner.main.tray :as main.tray]
     [metaverse.runner.main.window :as main.window]
-    [metaverse.runner.reporter :as reporter]
-    [metaverse.supabase :as supabase]
-    [metaverse.utils.platform :as platform]
-    [metaverse.utils.transit :as t]
+    [metaverse.runner.sentry :as sentry]
+    [metaverse.runner.utils.platform :as platform]
     [tenet.response :as r]))
 
 
@@ -35,6 +35,7 @@
 
 (defn open-url-handler
   [_event url]
+  (log/info :msg "open-url-handler" :url url)
   (when (str/starts-with? url "metaverse://app")
     (let [window       ^js/electron.BrowserWindow (main.window/get-instance)
           web-contents ^js/electron.BrowserWindow.webContents (.. window -webContents)]
@@ -87,7 +88,7 @@
 (defn setup-tools!
   []
   (log/init!)
-  (reporter/init!))
+  (sentry/init!))
 
 
 (defn setup-deps!
@@ -136,8 +137,10 @@
 ;; Entry point
 ;;
 
-(defn init!
-  []
+(defn -main
+  "Runner entry point."
+  {:export true}
+  [& _args]
   (setup!)
   (app/on "ready" mount)
   (app/on "activate" activate-handler)
diff --git a/src/main/clojure/metaverse/runner/api.cljs b/src/main/clojure/metaverse/runner/api.cljs
index 707d725..e35d1f5 100644
--- a/src/main/clojure/metaverse/runner/api.cljs
+++ b/src/main/clojure/metaverse/runner/api.cljs
@@ -1,6 +1,6 @@
 (ns metaverse.runner.api
   (:require
-    [metaverse.logger :as log :include-macros true]
+    [metaverse.common.logger :as log :include-macros true]
     [metaverse.runner.shell :as shell]
     [tenet.response :as r]))
 
diff --git a/src/main/clojure/metaverse/runner/api/auth.cljs b/src/main/clojure/metaverse/runner/api/auth.cljs
index 11afbc4..0cdaa83 100644
--- a/src/main/clojure/metaverse/runner/api/auth.cljs
+++ b/src/main/clojure/metaverse/runner/api/auth.cljs
@@ -1,8 +1,8 @@
 (ns metaverse.runner.api.auth
   (:require
-    [metaverse.logger :as log :include-macros true]
+    [metaverse.common.logger :as log :include-macros true]
+    [metaverse.common.supabase :as supabase]
     [metaverse.runner.api :as api]
-    [metaverse.supabase :as supabase]
     [tenet.response :as r]))
 
 
diff --git a/src/main/clojure/metaverse/runner/config.cljs b/src/main/clojure/metaverse/runner/config.cljs
index f34ad7d..40affc5 100644
--- a/src/main/clojure/metaverse/runner/config.cljs
+++ b/src/main/clojure/metaverse/runner/config.cljs
@@ -1,7 +1,7 @@
 (ns metaverse.runner.config
   (:require
-    [metaverse.env :as env]
-    [metaverse.utils.os :as os]))
+    [metaverse.common.env :as env]
+    [metaverse.runner.utils.os :as os]))
 
 
 ;;
@@ -16,10 +16,10 @@
 ;; URLs
 ;;
 
-(def ^:const root-dir js/__dirname)
+(def root-dir js/__dirname)
 
 
-(def ^:const index-url
+(def index-url
   (if env/develop?
     "http://localhost:3000/index.html"
     (str "file://" root-dir "/index.html")))
@@ -30,29 +30,29 @@
 ;; Window options
 ;;
 
-(def ^:const height 800)
-(def ^:const width 600)
-
-(def ^:const always-on-top? false)
-(def ^:const center? false)
-(def ^:const closable? true)
-(def ^:const devtools? env/develop?)
-(def ^:const frame? false)
-(def ^:const full-screenable? true)
-(def ^:const maximizable? true)
-(def ^:const minimizable? true)
-(def ^:const movable? true)
-(def ^:const resizable? true)
-(def ^:const show? false)
-(def ^:const title env/product-name)
-(def ^:const title-bar-overlay? false)
-(def ^:const title-bar-style :hidden)
-(def ^:const use-content-size? true)
-
-(def ^:const node-integration? false)
-(def ^:const sandbox? false)
-(def ^:const web-security? true)
-(def ^:const preload-file (str root-dir "/preload.js"))
+(def height 800)
+(def width 600)
+
+(def always-on-top? false)
+(def center? false)
+(def closable? true)
+(def devtools? env/develop?)
+(def frame? false)
+(def full-screenable? true)
+(def maximizable? true)
+(def minimizable? true)
+(def movable? true)
+(def resizable? true)
+(def show? false)
+(def title env/product-name)
+(def title-bar-overlay? false)
+(def title-bar-style :hidden)
+(def use-content-size? true)
+
+(def node-integration? false)
+(def sandbox? false)
+(def web-security? true)
+(def preload-file (str root-dir "/preload.js"))
 
 
 
diff --git a/src/main/clojure/metaverse/electron.cljs b/src/main/clojure/metaverse/runner/electron.cljs
similarity index 97%
rename from src/main/clojure/metaverse/electron.cljs
rename to src/main/clojure/metaverse/runner/electron.cljs
index 05a06b1..939f66a 100644
--- a/src/main/clojure/metaverse/electron.cljs
+++ b/src/main/clojure/metaverse/runner/electron.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.electron
+(ns metaverse.runner.electron
   (:require
     ["electron" :refer [app dialog screen shell nativeImage crashReporter
                         globalShortcut safeStorage ipcMain ipcRenderer contextBridge]
diff --git a/src/main/clojure/metaverse/electron/app.cljs b/src/main/clojure/metaverse/runner/electron/app.cljs
similarity index 92%
rename from src/main/clojure/metaverse/electron/app.cljs
rename to src/main/clojure/metaverse/runner/electron/app.cljs
index 04735e9..adf3e55 100644
--- a/src/main/clojure/metaverse/electron/app.cljs
+++ b/src/main/clojure/metaverse/runner/electron/app.cljs
@@ -1,6 +1,6 @@
-(ns metaverse.electron.app
+(ns metaverse.runner.electron.app
   (:require
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (defn on
diff --git a/src/main/clojure/metaverse/electron/dialog.cljs b/src/main/clojure/metaverse/runner/electron/dialog.cljs
similarity index 59%
rename from src/main/clojure/metaverse/electron/dialog.cljs
rename to src/main/clojure/metaverse/runner/electron/dialog.cljs
index 7d65356..163ffa7 100644
--- a/src/main/clojure/metaverse/electron/dialog.cljs
+++ b/src/main/clojure/metaverse/runner/electron/dialog.cljs
@@ -1,6 +1,6 @@
-(ns metaverse.electron.dialog
+(ns metaverse.runner.electron.dialog
   (:require
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (defn show-error-box
diff --git a/src/main/clojure/metaverse/electron/icon.cljs b/src/main/clojure/metaverse/runner/electron/icon.cljs
similarity index 67%
rename from src/main/clojure/metaverse/electron/icon.cljs
rename to src/main/clojure/metaverse/runner/electron/icon.cljs
index 00ec25a..2634d6e 100644
--- a/src/main/clojure/metaverse/electron/icon.cljs
+++ b/src/main/clojure/metaverse/runner/electron/icon.cljs
@@ -1,6 +1,6 @@
-(ns metaverse.electron.icon
+(ns metaverse.runner.electron.icon
   (:require
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (defn create-empty
diff --git a/src/main/clojure/metaverse/electron/ipc_main.cljs b/src/main/clojure/metaverse/runner/electron/ipc_main.cljs
similarity index 85%
rename from src/main/clojure/metaverse/electron/ipc_main.cljs
rename to src/main/clojure/metaverse/runner/electron/ipc_main.cljs
index 32c6811..5116154 100644
--- a/src/main/clojure/metaverse/electron/ipc_main.cljs
+++ b/src/main/clojure/metaverse/runner/electron/ipc_main.cljs
@@ -1,6 +1,6 @@
-(ns metaverse.electron.ipc-main
+(ns metaverse.runner.electron.ipc-main
   (:require
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (defn remove-handler!
diff --git a/src/main/clojure/metaverse/electron/keyboard.cljs b/src/main/clojure/metaverse/runner/electron/keyboard.cljs
similarity index 58%
rename from src/main/clojure/metaverse/electron/keyboard.cljs
rename to src/main/clojure/metaverse/runner/electron/keyboard.cljs
index d4e2d57..748db2c 100644
--- a/src/main/clojure/metaverse/electron/keyboard.cljs
+++ b/src/main/clojure/metaverse/runner/electron/keyboard.cljs
@@ -1,6 +1,6 @@
-(ns metaverse.electron.keyboard
+(ns metaverse.runner.electron.keyboard
   (:require
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (defn register-global-shortcut!
diff --git a/src/main/clojure/metaverse/electron/menu.cljs b/src/main/clojure/metaverse/runner/electron/menu.cljs
similarity index 69%
rename from src/main/clojure/metaverse/electron/menu.cljs
rename to src/main/clojure/metaverse/runner/electron/menu.cljs
index 00dfcc4..a93b9a8 100644
--- a/src/main/clojure/metaverse/electron/menu.cljs
+++ b/src/main/clojure/metaverse/runner/electron/menu.cljs
@@ -1,6 +1,6 @@
-(ns metaverse.electron.menu
+(ns metaverse.runner.electron.menu
   (:require
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (defn set-application-menu
diff --git a/src/main/clojure/metaverse/electron/safe_storage.cljs b/src/main/clojure/metaverse/runner/electron/safe_storage.cljs
similarity index 88%
rename from src/main/clojure/metaverse/electron/safe_storage.cljs
rename to src/main/clojure/metaverse/runner/electron/safe_storage.cljs
index c8af8f6..797502e 100644
--- a/src/main/clojure/metaverse/electron/safe_storage.cljs
+++ b/src/main/clojure/metaverse/runner/electron/safe_storage.cljs
@@ -1,7 +1,7 @@
-(ns metaverse.electron.safe-storage
+(ns metaverse.runner.electron.safe-storage
   (:require
     [clojure.string :as str]
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (def ^:const encoding "utf-8")
diff --git a/src/main/clojure/metaverse/electron/screen.cljs b/src/main/clojure/metaverse/runner/electron/screen.cljs
similarity index 80%
rename from src/main/clojure/metaverse/electron/screen.cljs
rename to src/main/clojure/metaverse/runner/electron/screen.cljs
index 7d52d5d..bf6f02e 100644
--- a/src/main/clojure/metaverse/electron/screen.cljs
+++ b/src/main/clojure/metaverse/runner/electron/screen.cljs
@@ -1,6 +1,6 @@
-(ns metaverse.electron.screen
+(ns metaverse.runner.electron.screen
   (:require
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (defn get-primary-display
diff --git a/src/main/clojure/metaverse/electron/store.cljs b/src/main/clojure/metaverse/runner/electron/store.cljs
similarity index 86%
rename from src/main/clojure/metaverse/electron/store.cljs
rename to src/main/clojure/metaverse/runner/electron/store.cljs
index fa5fecc..627de29 100644
--- a/src/main/clojure/metaverse/electron/store.cljs
+++ b/src/main/clojure/metaverse/runner/electron/store.cljs
@@ -1,8 +1,8 @@
-(ns metaverse.electron.store
+(ns metaverse.runner.electron.store
   (:refer-clojure :exclude [get get-in assoc dissoc])
   (:require
     [clojure.string :as str]
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (defn create-store
diff --git a/src/main/clojure/metaverse/electron/tray.cljs b/src/main/clojure/metaverse/runner/electron/tray.cljs
similarity index 82%
rename from src/main/clojure/metaverse/electron/tray.cljs
rename to src/main/clojure/metaverse/runner/electron/tray.cljs
index 14d7f4e..19e7024 100644
--- a/src/main/clojure/metaverse/electron/tray.cljs
+++ b/src/main/clojure/metaverse/runner/electron/tray.cljs
@@ -1,7 +1,7 @@
-(ns metaverse.electron.tray
+(ns metaverse.runner.electron.tray
   (:require
-    [metaverse.electron :as electron]
-    [metaverse.electron.icon :as icon]))
+    [metaverse.runner.electron :as electron]
+    [metaverse.runner.electron.icon :as icon]))
 
 
 (defn ^js/electron.Tray get-instance
diff --git a/src/main/clojure/metaverse/electron/window.cljs b/src/main/clojure/metaverse/runner/electron/window.cljs
similarity index 94%
rename from src/main/clojure/metaverse/electron/window.cljs
rename to src/main/clojure/metaverse/runner/electron/window.cljs
index 936fbea..a1558b5 100644
--- a/src/main/clojure/metaverse/electron/window.cljs
+++ b/src/main/clojure/metaverse/runner/electron/window.cljs
@@ -1,6 +1,6 @@
-(ns metaverse.electron.window
+(ns metaverse.runner.electron.window
   (:require
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (defn get-instance
diff --git a/src/main/clojure/metaverse/runner/main/menu.cljs b/src/main/clojure/metaverse/runner/main/menu.cljs
index 3d3c726..a6c3243 100644
--- a/src/main/clojure/metaverse/runner/main/menu.cljs
+++ b/src/main/clojure/metaverse/runner/main/menu.cljs
@@ -1,10 +1,10 @@
 (ns metaverse.runner.main.menu
   (:require
-    [metaverse.electron.menu :as menu]
-    [metaverse.electron.window :as window]
-    [metaverse.env :as env]
+    [metaverse.common.env :as env]
     [metaverse.runner.config :as config]
-    [metaverse.utils.platform :as platform]))
+    [metaverse.runner.electron.menu :as menu]
+    [metaverse.runner.electron.window :as window]
+    [metaverse.runner.utils.platform :as platform]))
 
 
 (defn create-menu
diff --git a/src/main/clojure/metaverse/runner/main/tray.cljs b/src/main/clojure/metaverse/runner/main/tray.cljs
index 75ffea2..b81f6d6 100644
--- a/src/main/clojure/metaverse/runner/main/tray.cljs
+++ b/src/main/clojure/metaverse/runner/main/tray.cljs
@@ -1,8 +1,8 @@
 (ns metaverse.runner.main.tray
   (:require
-    [metaverse.electron.tray :as tray]
+    [metaverse.runner.electron.tray :as tray]
     [metaverse.runner.path :as path]
-    [metaverse.utils.path :as utils.path]))
+    [metaverse.runner.utils.path :as utils.path]))
 
 
 (defonce *ref (atom nil))
diff --git a/src/main/clojure/metaverse/runner/main/window.cljs b/src/main/clojure/metaverse/runner/main/window.cljs
index 94925db..97df83c 100644
--- a/src/main/clojure/metaverse/runner/main/window.cljs
+++ b/src/main/clojure/metaverse/runner/main/window.cljs
@@ -1,8 +1,8 @@
 (ns metaverse.runner.main.window
   (:require
-    [metaverse.electron.window :as window]
     [metaverse.runner.config :as config]
-    [metaverse.utils.platform :as platform]))
+    [metaverse.runner.electron.window :as window]
+    [metaverse.runner.utils.platform :as platform]))
 
 
 (defonce *ref (atom nil))
diff --git a/src/main/clojure/metaverse/runner/path.cljs b/src/main/clojure/metaverse/runner/path.cljs
index e97230e..ecff58e 100644
--- a/src/main/clojure/metaverse/runner/path.cljs
+++ b/src/main/clojure/metaverse/runner/path.cljs
@@ -1,7 +1,7 @@
 (ns metaverse.runner.path
   (:require
     [metaverse.runner.config :as config]
-    [metaverse.utils.path :as path]))
+    [metaverse.runner.utils.path :as path]))
 
 
 (def assets-dir
diff --git a/src/main/clojure/metaverse/runner/reporter.cljs b/src/main/clojure/metaverse/runner/reporter.cljs
deleted file mode 100644
index 7b1724f..0000000
--- a/src/main/clojure/metaverse/runner/reporter.cljs
+++ /dev/null
@@ -1,34 +0,0 @@
-(ns metaverse.runner.reporter
-  (:require
-    [metaverse.env :as env]
-    [metaverse.logger :as log :include-macros true]
-    [metaverse.sentry.electron :as sentry]
-    [metaverse.utils.string :as str]
-    [tenet.response :as r]))
-
-
-;; TODO: [2022-05-02, ilshat@sultanov.team] validate opts
-
-(defn init!
-  ([]
-   (init! {}))
-  ([{:keys [dsn] :as opts}]
-   (let [dsn (or dsn env/sentry-dsn)]
-     (if (= "N/A" dsn)
-       (do
-         (log/error :msg "Sentry reporter is not initialized" :opts opts)
-         (r/as-incorrect env/sentry-dsn))
-       (let [version  (:version env/build-info)
-             build    (-> env/build-info
-                          (:metadata)
-                          (assoc :version version))
-             opts'    (-> {:dsn              env/sentry-dsn,
-                           :environment      env/mode,
-                           :tracesSampleRate 1.0,
-                           :debug            env/develop?
-                           :release          (str/format "%s@%s:%s" env/company-name env/product-name version)
-                           :initialScope     {:build build}}
-                          (merge opts))
-             reporter (sentry/init! opts')]
-         (log/info :msg "Sentry reporter successfully initialized" :opts opts')
-         (r/as-success reporter))))))
diff --git a/src/main/clojure/metaverse/runner/secret.cljs b/src/main/clojure/metaverse/runner/secret.cljs
index c48f4fa..50df675 100644
--- a/src/main/clojure/metaverse/runner/secret.cljs
+++ b/src/main/clojure/metaverse/runner/secret.cljs
@@ -1,8 +1,8 @@
 (ns metaverse.runner.secret
   (:require
-    [metaverse.electron.safe-storage :as safe-storage]
-    [metaverse.electron.store :as store]
-    [metaverse.runner.config :as config]))
+    [metaverse.runner.config :as config]
+    [metaverse.runner.electron.safe-storage :as safe-storage]
+    [metaverse.runner.electron.store :as store]))
 
 
 (defonce store
diff --git a/src/main/clojure/metaverse/runner/sentry.cljs b/src/main/clojure/metaverse/runner/sentry.cljs
new file mode 100644
index 0000000..d8d9be3
--- /dev/null
+++ b/src/main/clojure/metaverse/runner/sentry.cljs
@@ -0,0 +1,10 @@
+(ns metaverse.runner.sentry
+  (:require
+    ["@sentry/node" :as sentry]
+    ["@sentry/tracing"]
+    [metaverse.common.reporter :as reporter]))
+
+
+(defn init!
+  []
+  (reporter/init! sentry))
diff --git a/src/main/clojure/metaverse/runner/shell.cljs b/src/main/clojure/metaverse/runner/shell.cljs
index 21aecea..b552268 100644
--- a/src/main/clojure/metaverse/runner/shell.cljs
+++ b/src/main/clojure/metaverse/runner/shell.cljs
@@ -1,6 +1,6 @@
 (ns metaverse.runner.shell
   (:require
-    [metaverse.electron :as electron]))
+    [metaverse.runner.electron :as electron]))
 
 
 (defn open-external
diff --git a/src/main/clojure/metaverse/utils/fs.cljs b/src/main/clojure/metaverse/runner/utils/fs.cljs
similarity index 95%
rename from src/main/clojure/metaverse/utils/fs.cljs
rename to src/main/clojure/metaverse/runner/utils/fs.cljs
index 162685f..f569277 100644
--- a/src/main/clojure/metaverse/utils/fs.cljs
+++ b/src/main/clojure/metaverse/runner/utils/fs.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.utils.fs
+(ns metaverse.runner.utils.fs
   (:require
     ["fs" :as fs]))
 
diff --git a/src/main/clojure/metaverse/utils/os.cljs b/src/main/clojure/metaverse/runner/utils/os.cljs
similarity index 88%
rename from src/main/clojure/metaverse/utils/os.cljs
rename to src/main/clojure/metaverse/runner/utils/os.cljs
index c75c021..6acfded 100644
--- a/src/main/clojure/metaverse/utils/os.cljs
+++ b/src/main/clojure/metaverse/runner/utils/os.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.utils.os
+(ns metaverse.runner.utils.os
   (:require
     ["os" :as os]))
 
diff --git a/src/main/clojure/metaverse/utils/path.cljs b/src/main/clojure/metaverse/runner/utils/path.cljs
similarity index 85%
rename from src/main/clojure/metaverse/utils/path.cljs
rename to src/main/clojure/metaverse/runner/utils/path.cljs
index 669f294..4af69d0 100644
--- a/src/main/clojure/metaverse/utils/path.cljs
+++ b/src/main/clojure/metaverse/runner/utils/path.cljs
@@ -1,4 +1,4 @@
-(ns metaverse.utils.path
+(ns metaverse.runner.utils.path
   (:require
     ["path" :as path]))
 
diff --git a/src/main/clojure/metaverse/runner/utils/platform.cljs b/src/main/clojure/metaverse/runner/utils/platform.cljs
new file mode 100644
index 0000000..77c278b
--- /dev/null
+++ b/src/main/clojure/metaverse/runner/utils/platform.cljs
@@ -0,0 +1,5 @@
+(ns metaverse.runner.utils.platform)
+
+
+(def platform js/process.platform)
+(def mac-os? (= "darwin" platform))
diff --git a/src/main/clojure/metaverse/sentry/electron.cljs b/src/main/clojure/metaverse/sentry/electron.cljs
deleted file mode 100644
index 8137f7b..0000000
--- a/src/main/clojure/metaverse/sentry/electron.cljs
+++ /dev/null
@@ -1,12 +0,0 @@
-(ns metaverse.sentry.electron
-  (:require
-    ["@sentry/electron" :as sentry]
-    ["@sentry/tracing"]))
-
-
-(defn init!
-  [opts]
-  (.init sentry (clj->js opts)))
-
-
-;; TODO: [2022-05-02, ilshat@sultanov.team] Add close handler, setContext, setUser, etc
diff --git a/src/main/clojure/metaverse/sentry/nodejs.cljs b/src/main/clojure/metaverse/sentry/nodejs.cljs
deleted file mode 100644
index 64c9227..0000000
--- a/src/main/clojure/metaverse/sentry/nodejs.cljs
+++ /dev/null
@@ -1,12 +0,0 @@
-(ns metaverse.sentry.nodejs
-  (:require
-    ["@sentry/node" :as sentry]
-    ["@sentry/tracing"]))
-
-
-(defn init!
-  [opts]
-  (.init sentry (clj->js opts)))
-
-
-;; TODO: [2022-05-02, ilshat@sultanov.team] Add close handler, setContext, setUser, etc
diff --git a/src/main/clojure/metaverse/ui/core.cljs b/src/main/clojure/metaverse/ui/core.cljs
deleted file mode 100644
index 5b3d516..0000000
--- a/src/main/clojure/metaverse/ui/core.cljs
+++ /dev/null
@@ -1,6 +0,0 @@
-(ns metaverse.ui.core)
-
-
-(defn square
-  [x]
-  (* x x))
diff --git a/src/main/clojure/metaverse/ui/main.cljs b/src/main/clojure/metaverse/ui/main.cljs
deleted file mode 100644
index 17f3f4f..0000000
--- a/src/main/clojure/metaverse/ui/main.cljs
+++ /dev/null
@@ -1,51 +0,0 @@
-(ns metaverse.ui.main
-  (:require
-    [goog.dom :as gdom]
-    [metaverse.logger :as logger]
-    [metaverse.ui.db :as db]
-    [metaverse.ui.pages.home :as home]
-    [metaverse.ui.router.core :as router]
-    [metaverse.ui.storage]
-    [metaverse.utils.transit :as t]
-    [re-frame.core :as rf]
-    [reagent.core :as r]
-    [reagent.dom :as dom]))
-
-
-(defn setup-tools
-  "Setup tools."
-  []
-  (logger/init!))
-
-
-(defn root
-  []
-  (let [did-mount (fn [_]
-                    (.. js/window -bridge
-                        (dispatch (fn [_ipc-event event]
-                                    (let [event (t/read event)]
-                                      (rf/dispatch @event))))))]
-    (r/create-class
-      {:display-name        "root"
-       :component-did-mount did-mount
-       :reagent-render      (fn []
-                              [home/page])})))
-
-
-(defn mount-root
-  "Mount root component."
-  {:dev/after-load true}
-  []
-  (when-some [root-elem (gdom/getElement "root")]
-    (rf/clear-subscription-cache!)
-    (router/init!)
-    (dom/render [root] root-elem)))
-
-
-(defn init!
-  "UI initializer."
-  {:export true}
-  []
-  (setup-tools)
-  (rf/dispatch-sync [::db/init])
-  (mount-root))
diff --git a/src/main/clojure/metaverse/ui/profile/core.cljs b/src/main/clojure/metaverse/ui/profile/core.cljs
deleted file mode 100644
index 1b06f99..0000000
--- a/src/main/clojure/metaverse/ui/profile/core.cljs
+++ /dev/null
@@ -1,3 +0,0 @@
-(ns metaverse.ui.profile.core
-  (:require
-    [metaverse.ui.profile.subs]))
diff --git a/src/main/clojure/metaverse/utils/json.cljs b/src/main/clojure/metaverse/utils/json.cljs
deleted file mode 100644
index bbfa74a..0000000
--- a/src/main/clojure/metaverse/utils/json.cljs
+++ /dev/null
@@ -1,6 +0,0 @@
-(ns metaverse.utils.json)
-
-
-(defn parse-json
-  [x]
-  (js->clj x :keywordize-keys true))
diff --git a/src/main/clojure/metaverse/utils/platform.cljs b/src/main/clojure/metaverse/utils/platform.cljs
deleted file mode 100644
index 4a3b498..0000000
--- a/src/main/clojure/metaverse/utils/platform.cljs
+++ /dev/null
@@ -1,5 +0,0 @@
-(ns metaverse.utils.platform)
-
-
-(def ^:const platform js/process.platform)
-(def ^:const mac-os? (= "darwin" platform))
diff --git a/src/test/clojure/metaverse/utils/transit_test.cljs b/src/test/clojure/metaverse/common/utils/transit_test.cljs
similarity index 88%
rename from src/test/clojure/metaverse/utils/transit_test.cljs
rename to src/test/clojure/metaverse/common/utils/transit_test.cljs
index 206e027..da661e4 100644
--- a/src/test/clojure/metaverse/utils/transit_test.cljs
+++ b/src/test/clojure/metaverse/common/utils/transit_test.cljs
@@ -1,7 +1,7 @@
-(ns metaverse.utils.transit-test
+(ns metaverse.common.utils.transit-test
   (:require
     [cljs.test :refer [deftest testing is]]
-    [metaverse.utils.transit :as sut]
+    [metaverse.common.utils.transit :as sut]
     [tenet.response :as r]))
 
 
diff --git a/tailwind.config.js b/tailwind.config.js
index 44f3ab3..1593ddb 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,8 +1,8 @@
 module.exports = {
   content:
     process.env.NODE_ENV === "production"
-      ? ["./public/**/*.html", "./public/assets/js/main.js"]
-      : ["./public/**/*.html", "./public/assets/js/main.js", "./public/assets/js/cljs-runtime/*.js"],
+      ? ["./public/**/*.html", "./public/js/renderer.js"]
+      : ["./public/**/*.html", "./public/js/renderer.js", "./public/js/cljs-runtime/*.js"],
   theme: {
     extend: {
       backgroundImage: {