diff --git a/shadow-cljs.edn b/shadow-cljs.edn
index 1e5c09963b..d7b6f1bb39 100644
--- a/shadow-cljs.edn
+++ b/shadow-cljs.edn
@@ -38,7 +38,7 @@
  {:mobile
   {:target     :react-native
    :output-dir "app"
-   :init-fn    status-im2.setup.core/init
+   :init-fn    status-im2.core/init
    ;; When false, the Shadow-CLJS watcher won't automatically refresh
    ;; the target files (a.k.a hot reload). When false, you can manually
    ;; reload by calling `shadow.cljs.devtools.api/watch-compile-all!`.
diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs
index 893e7fc67e..a1fe2b7971 100644
--- a/src/status_im/multiaccounts/login/core.cljs
+++ b/src/status_im/multiaccounts/login/core.cljs
@@ -42,7 +42,7 @@
    [status-im2.contexts.activity-center.events :as activity-center]
    [status-im2.contexts.chat.messages.link-preview.events :as link-preview]
    [status-im2.navigation.events :as navigation]
-   [status-im2.setup.log :as logging]
+   [status-im2.common.log :as logging]
    [taoensso.timbre :as log]
    [utils.security.core :as security]))
 
diff --git a/src/status_im/multiaccounts/logout/core.cljs b/src/status_im/multiaccounts/logout/core.cljs
index 06bc262dc5..6198fd2949 100644
--- a/src/status_im/multiaccounts/logout/core.cljs
+++ b/src/status_im/multiaccounts/logout/core.cljs
@@ -7,7 +7,7 @@
             [utils.re-frame :as rf]
             [status-im.utils.keychain.core :as keychain]
             [status-im.wallet.core :as wallet]
-            [status-im2.setup.events :as init]))
+            [status-im2.events :as init]))
 
 (rf/defn logout-method
   {:events [::logout-method]}
diff --git a/src/status_im/utils/logging/core.cljs b/src/status_im/utils/logging/core.cljs
index 750cc1d959..9ac15f73ad 100644
--- a/src/status_im/utils/logging/core.cljs
+++ b/src/status_im/utils/logging/core.cljs
@@ -13,7 +13,7 @@
             [utils.datetime :as datetime]
             [status-im.utils.platform :as platform]
             [status-im.utils.types :as types]
-            [status-im2.setup.log :as log]))
+            [status-im2.common.log :as log]))
 
 (def report-email "error-reports@status.im")
 
diff --git a/src/status_im2/setup/log.cljs b/src/status_im2/common/log.cljs
similarity index 97%
rename from src/status_im2/setup/log.cljs
rename to src/status_im2/common/log.cljs
index bbd2b407b6..1ed62c150b 100644
--- a/src/status_im2/setup/log.cljs
+++ b/src/status_im2/common/log.cljs
@@ -1,4 +1,4 @@
-(ns status-im2.setup.log
+(ns status-im2.common.log
   (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
             [status-im2.config :as config]
diff --git a/src/status_im2/setup/core.cljs b/src/status_im2/core.cljs
similarity index 93%
rename from src/status_im2/setup/core.cljs
rename to src/status_im2/core.cljs
index 2e15ac808b..a48ce06caf 100644
--- a/src/status_im2/setup/core.cljs
+++ b/src/status_im2/core.cljs
@@ -1,4 +1,4 @@
-(ns status-im2.setup.core
+(ns status-im2.core
   (:require
    [utils.i18n :as i18n]
    [status-im2.setup.i18n-resources :as i18n-resources]
@@ -9,19 +9,18 @@
    [react-native.platform :as platform]
    [react-native.shake :as react-native-shake]
    [reagent.impl.batching :as batching]
+   [status-im2.contexts.shell.animation :as animation]
+   [status-im2.config :as config]
+   [status-im2.setup.dev :as dev]
+   [status-im2.setup.global-error :as global-error]
+   [status-im2.common.log :as log]
    [status-im.async-storage.core :as async-storage]
-   status-im.events
    [status-im.native-module.core :as status]
    [status-im.notifications.local :as notifications]
    [status-im.utils.universal-links.core :as utils.universal-links]
-   [status-im2.contexts.shell.animation :as animation]
-   status-im2.contexts.syncing.events
+   status-im.events
+   status-im2.events
    status-im2.navigation.core
-   [status-im2.config :as config]
-   [status-im2.setup.dev :as dev]
-   status-im2.setup.events
-   [status-im2.setup.global-error :as global-error]
-   [status-im2.setup.log :as log]
    status-im2.subs.root))
 
 ;;;; re-frame RN setup
diff --git a/src/status_im2/setup/db.cljs b/src/status_im2/db.cljs
similarity index 98%
rename from src/status_im2/setup/db.cljs
rename to src/status_im2/db.cljs
index 5780c37a2b..e5bda384c9 100644
--- a/src/status_im2/setup/db.cljs
+++ b/src/status_im2/db.cljs
@@ -1,4 +1,4 @@
-(ns status-im2.setup.db
+(ns status-im2.db
   (:require [react-native.core :as rn]
             [status-im.fleet.core :as fleet]
             [status-im.wallet.db :as wallet.db]
diff --git a/src/status_im2/setup/events.cljs b/src/status_im2/events.cljs
similarity index 96%
rename from src/status_im2/setup/events.cljs
rename to src/status_im2/events.cljs
index 330dac23a9..c6cda8e260 100644
--- a/src/status_im2/setup/events.cljs
+++ b/src/status_im2/events.cljs
@@ -1,4 +1,4 @@
-(ns status-im2.setup.events
+(ns status-im2.events
   (:require [clojure.string :as string]
             [quo.theme :as quo.theme]
             [quo2.theme :as quo2.theme]
@@ -10,9 +10,10 @@
             [status-im2.common.theme.core :as theme]
             [status-im2.common.toasts.events]
             [status-im2.navigation.events :as navigation]
-            [status-im2.setup.db :as db]
+            [status-im2.db :as db]
             [utils.re-frame :as rf]
-            [utils.datetime :as datetime]))
+            [utils.datetime :as datetime]
+            status-im2.contexts.syncing.events))
 
 (re-frame/reg-cofx
  :now