diff --git a/src/status_im2/data_store/wallet.cljs b/src/status_im2/common/data_store/wallet.cljs
similarity index 95%
rename from src/status_im2/data_store/wallet.cljs
rename to src/status_im2/common/data_store/wallet.cljs
index c5952fa344..3c4cdada15 100644
--- a/src/status_im2/data_store/wallet.cljs
+++ b/src/status_im2/common/data_store/wallet.cljs
@@ -1,4 +1,4 @@
-(ns status-im2.data-store.wallet
+(ns status-im2.common.data-store.wallet
   (:require
     clojure.set))
 
diff --git a/src/dev/component_preview/events.cljs b/src/status_im2/contexts/quo_preview/component_preview/events.cljs
similarity index 94%
rename from src/dev/component_preview/events.cljs
rename to src/status_im2/contexts/quo_preview/component_preview/events.cljs
index 97ccfe5826..60b54899a2 100644
--- a/src/dev/component_preview/events.cljs
+++ b/src/status_im2/contexts/quo_preview/component_preview/events.cljs
@@ -1,4 +1,4 @@
-(ns dev.component-preview.events
+(ns status-im2.contexts.quo-preview.component-preview.events
   (:require
     [quo.core :as quo]
     [re-frame.core :as re-frame]))
diff --git a/src/dev/component_preview/view.cljs b/src/status_im2/contexts/quo_preview/component_preview/view.cljs
similarity index 85%
rename from src/dev/component_preview/view.cljs
rename to src/status_im2/contexts/quo_preview/component_preview/view.cljs
index 790f0a1dea..bdd3360b4f 100644
--- a/src/dev/component_preview/view.cljs
+++ b/src/status_im2/contexts/quo_preview/component_preview/view.cljs
@@ -1,4 +1,4 @@
-(ns dev.component-preview.view
+(ns status-im2.contexts.quo-preview.component-preview.view
   (:require
     [react-native.core :as rn]
     [utils.re-frame :as rf]))
diff --git a/src/status_im2/contexts/wallet/events.cljs b/src/status_im2/contexts/wallet/events.cljs
index 2209f5c553..01ea80e5bf 100644
--- a/src/status_im2/contexts/wallet/events.cljs
+++ b/src/status_im2/contexts/wallet/events.cljs
@@ -1,7 +1,7 @@
 (ns status-im2.contexts.wallet.events
   (:require
     [native-module.core :as native-module]
-    [status-im2.data-store.wallet :as data-store]
+    [status-im2.common.data-store.wallet :as data-store]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]
     [utils.security.core :as security]))
diff --git a/src/status_im2/navigation/screens.cljs b/src/status_im2/navigation/screens.cljs
index 98212cb407..a2acffaf48 100644
--- a/src/status_im2/navigation/screens.cljs
+++ b/src/status_im2/navigation/screens.cljs
@@ -1,6 +1,5 @@
 (ns status-im2.navigation.screens
   (:require
-    [dev.component-preview.view :as component-preview]
     [status-im.ui.screens.screens :as old-screens]
     [status-im2.config :as config]
     [status-im2.contexts.add-new-contact.views :as add-new-contact]
@@ -28,6 +27,7 @@
     [status-im2.contexts.onboarding.syncing.results.view :as syncing-results]
     [status-im2.contexts.onboarding.welcome.view :as welcome]
     [status-im2.contexts.profile.profiles.view :as profiles]
+    [status-im2.contexts.quo-preview.component-preview.view :as component-preview]
     [status-im2.contexts.quo-preview.main :as quo.preview]
     [status-im2.contexts.shell.activity-center.view :as activity-center]
     [status-im2.contexts.shell.jump-to.view :as shell]