diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs
index 448326b5b1..35e5874955 100644
--- a/src/status_im/events.cljs
+++ b/src/status_im/events.cljs
@@ -54,7 +54,7 @@
     status-im.wallet.custom-tokens.core
     status-im2.contexts.activity-center.events
     status-im2.contexts.activity-center.notification.contact-requests.events
-    status-im2.contexts.shell.events
+    status-im2.contexts.shell.jump-to.events
     status-im2.contexts.onboarding.events
     status-im.chat.models.gaps
     [status-im2.navigation.events :as navigation]
diff --git a/src/status_im/multiaccounts/core.cljs b/src/status_im/multiaccounts/core.cljs
index b85fdeef62..9be99974d8 100644
--- a/src/status_im/multiaccounts/core.cljs
+++ b/src/status_im/multiaccounts/core.cljs
@@ -12,7 +12,7 @@
             [status-im2.setup.hot-reload :as hot-reload]
             [status-im2.common.theme.core :as theme]
             [taoensso.timbre :as log]
-            [status-im2.contexts.shell.utils :as shell.utils]
+            [status-im2.contexts.shell.jump-to.utils :as shell.utils]
             [status-im.contact.db :as contact.db]))
 
 ;; validate that the given mnemonic was generated from Status Dictionary
diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs
index bacada92b8..98e5c7b38a 100644
--- a/src/status_im/multiaccounts/login/core.cljs
+++ b/src/status_im/multiaccounts/login/core.cljs
@@ -41,11 +41,11 @@
     [status-im2.contexts.chat.messages.link-preview.events :as link-preview]
     [status-im2.contexts.contacts.events :as contacts]
     [status-im2.navigation.events :as navigation]
-    [status-im2.contexts.shell.constants :as shell.constants]
+    [status-im2.contexts.shell.jump-to.constants :as shell.constants]
     [status-im2.contexts.communities.discover.events :as contract-communities]
     [status-im2.common.log :as logging]
     [taoensso.timbre :as log]
-    [status-im2.contexts.shell.utils :as shell.utils]
+    [status-im2.contexts.shell.jump-to.utils :as shell.utils]
     [utils.security.core :as security]))
 
 (re-frame/reg-fx
diff --git a/src/status_im2/contexts/onboarding/common/background/view.cljs b/src/status_im2/contexts/onboarding/common/background/view.cljs
index dbf5598b73..c63fd50674 100644
--- a/src/status_im2/contexts/onboarding/common/background/view.cljs
+++ b/src/status_im2/contexts/onboarding/common/background/view.cljs
@@ -6,7 +6,7 @@
             [oops.core :refer [oget]]
             [status-im2.common.resources :as resources]
             [status-im.async-storage.core :as async-storage]
-            [status-im2.contexts.shell.state :as shell.state]
+            [status-im2.contexts.shell.jump-to.state :as shell.state]
             [status-im2.contexts.onboarding.common.carousel.view :as carousel]
             [status-im2.contexts.onboarding.common.background.style :as style]
             [react-native.reanimated :as reanimated]
diff --git a/src/status_im2/contexts/onboarding/enable_notifications/view.cljs b/src/status_im2/contexts/onboarding/enable_notifications/view.cljs
index c5b45aaa62..d684e5aa1d 100644
--- a/src/status_im2/contexts/onboarding/enable_notifications/view.cljs
+++ b/src/status_im2/contexts/onboarding/enable_notifications/view.cljs
@@ -11,7 +11,7 @@
     [status-im2.contexts.onboarding.common.background.view :as background]
     [status-im2.contexts.onboarding.common.navigation-bar.view :as navigation-bar]
     [status-im2.contexts.onboarding.enable-notifications.style :as style]
-    [status-im2.contexts.shell.utils :as shell.utils]))
+    [status-im2.contexts.shell.jump-to.utils :as shell.utils]))
 
 (defn page-title
   []
diff --git a/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs b/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs
index 7b7774422b..76bb795133 100644
--- a/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs
+++ b/src/status_im2/contexts/quo_preview/switcher/switcher_cards.cljs
@@ -5,8 +5,8 @@
             [status-im2.constants :as constants]
             [status-im2.common.resources :as resources]
             [status-im2.contexts.quo-preview.preview :as preview]
-            [status-im2.contexts.shell.components.switcher-cards.view :as switcher-cards]
-            [status-im2.contexts.shell.constants :as shell.constants]))
+            [status-im2.contexts.shell.jump-to.components.switcher-cards.view :as switcher-cards]
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]))
 
 (def descriptor
   [{:label   "Type"
diff --git a/src/status_im2/contexts/shell/animation.cljs b/src/status_im2/contexts/shell/jump_to/animation.cljs
similarity index 93%
rename from src/status_im2/contexts/shell/animation.cljs
rename to src/status_im2/contexts/shell/jump_to/animation.cljs
index 35cd9af67d..6ffb9e994c 100644
--- a/src/status_im2/contexts/shell/animation.cljs
+++ b/src/status_im2/contexts/shell/jump_to/animation.cljs
@@ -1,9 +1,9 @@
-(ns status-im2.contexts.shell.animation
+(ns status-im2.contexts.shell.jump-to.animation
   (:require [utils.re-frame :as rf]
             [react-native.reanimated :as reanimated]
-            [status-im2.contexts.shell.utils :as utils]
-            [status-im2.contexts.shell.state :as state]
-            [status-im2.contexts.shell.constants :as shell.constants]))
+            [status-im2.contexts.shell.jump-to.utils :as utils]
+            [status-im2.contexts.shell.jump-to.state :as state]
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]))
 
 ;; Home stack
 (defn open-home-stack
diff --git a/src/status_im2/contexts/shell/components/bottom_tabs/style.cljs b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/style.cljs
similarity index 89%
rename from src/status_im2/contexts/shell/components/bottom_tabs/style.cljs
rename to src/status_im2/contexts/shell/jump_to/components/bottom_tabs/style.cljs
index 07b8aee0ad..85bb4dd1d0 100644
--- a/src/status_im2/contexts/shell/components/bottom_tabs/style.cljs
+++ b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/style.cljs
@@ -1,8 +1,8 @@
-(ns status-im2.contexts.shell.components.bottom-tabs.style
+(ns status-im2.contexts.shell.jump-to.components.bottom-tabs.style
   (:require [quo2.foundations.colors :as colors]
             [react-native.platform :as platform]
             [react-native.reanimated :as reanimated]
-            [status-im2.contexts.shell.utils :as utils]))
+            [status-im2.contexts.shell.jump-to.utils :as utils]))
 
 (defn bottom-tabs-container
   [pass-through? height]
diff --git a/src/status_im2/contexts/shell/components/bottom_tabs/view.cljs b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs
similarity index 87%
rename from src/status_im2/contexts/shell/components/bottom_tabs/view.cljs
rename to src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs
index 604d945bf4..26def87d1d 100644
--- a/src/status_im2/contexts/shell/components/bottom_tabs/view.cljs
+++ b/src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs
@@ -1,15 +1,15 @@
-(ns status-im2.contexts.shell.components.bottom-tabs.view
+(ns status-im2.contexts.shell.jump-to.components.bottom-tabs.view
   (:require [utils.re-frame :as rf]
             [react-native.core :as rn]
             [react-native.blur :as blur]
             [react-native.gesture :as gesture]
             [react-native.reanimated :as reanimated]
-            [status-im2.contexts.shell.utils :as utils]
-            [status-im2.contexts.shell.state :as state]
-            [status-im2.contexts.shell.animation :as animation]
-            [status-im2.contexts.shell.constants :as shell.constants]
+            [status-im2.contexts.shell.jump-to.utils :as utils]
+            [status-im2.contexts.shell.jump-to.state :as state]
+            [status-im2.contexts.shell.jump-to.animation :as animation]
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]
             [quo2.components.navigation.bottom-nav-tab.view :as bottom-nav-tab]
-            [status-im2.contexts.shell.components.bottom-tabs.style :as style]))
+            [status-im2.contexts.shell.jump-to.components.bottom-tabs.style :as style]))
 
 (defn blur-overlay-params
   [style]
diff --git a/src/status_im2/contexts/shell/components/floating_screens/style.cljs b/src/status_im2/contexts/shell/jump_to/components/floating_screens/style.cljs
similarity index 89%
rename from src/status_im2/contexts/shell/components/floating_screens/style.cljs
rename to src/status_im2/contexts/shell/jump_to/components/floating_screens/style.cljs
index 6becbc38ef..cdf8a4563f 100644
--- a/src/status_im2/contexts/shell/components/floating_screens/style.cljs
+++ b/src/status_im2/contexts/shell/jump_to/components/floating_screens/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im2.contexts.shell.components.floating-screens.style
+(ns status-im2.contexts.shell.jump-to.components.floating-screens.style
   (:require [quo2.foundations.colors :as colors]
             [react-native.reanimated :as reanimated]))
 
diff --git a/src/status_im2/contexts/shell/components/floating_screens/view.cljs b/src/status_im2/contexts/shell/jump_to/components/floating_screens/view.cljs
similarity index 75%
rename from src/status_im2/contexts/shell/components/floating_screens/view.cljs
rename to src/status_im2/contexts/shell/jump_to/components/floating_screens/view.cljs
index 96334a14c9..fc48d7bd81 100644
--- a/src/status_im2/contexts/shell/components/floating_screens/view.cljs
+++ b/src/status_im2/contexts/shell/jump_to/components/floating_screens/view.cljs
@@ -1,13 +1,13 @@
-(ns status-im2.contexts.shell.components.floating-screens.view
+(ns status-im2.contexts.shell.jump-to.components.floating-screens.view
   (:require [utils.re-frame :as rf]
             [react-native.core :as rn]
             [react-native.reanimated :as reanimated]
-            [status-im2.contexts.shell.state :as state]
-            [status-im2.contexts.shell.utils :as utils]
+            [status-im2.contexts.shell.jump-to.state :as state]
+            [status-im2.contexts.shell.jump-to.utils :as utils]
             [status-im2.contexts.chat.messages.view :as chat]
-            [status-im2.contexts.shell.animation :as animation]
-            [status-im2.contexts.shell.constants :as shell.constants]
-            [status-im2.contexts.shell.components.floating-screens.style :as style]
+            [status-im2.contexts.shell.jump-to.animation :as animation]
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]
+            [status-im2.contexts.shell.jump-to.components.floating-screens.style :as style]
             [status-im2.contexts.communities.overview.view :as communities.overview]))
 
 (def screens-map
diff --git a/src/status_im2/contexts/shell/components/home_stack/style.cljs b/src/status_im2/contexts/shell/jump_to/components/home_stack/style.cljs
similarity index 90%
rename from src/status_im2/contexts/shell/components/home_stack/style.cljs
rename to src/status_im2/contexts/shell/jump_to/components/home_stack/style.cljs
index a487cc5131..32b7a9916a 100644
--- a/src/status_im2/contexts/shell/components/home_stack/style.cljs
+++ b/src/status_im2/contexts/shell/jump_to/components/home_stack/style.cljs
@@ -1,7 +1,7 @@
-(ns status-im2.contexts.shell.components.home-stack.style
+(ns status-im2.contexts.shell.jump-to.components.home-stack.style
   (:require [quo2.foundations.colors :as colors]
             [react-native.reanimated :as reanimated]
-            [status-im2.contexts.shell.utils :as utils]))
+            [status-im2.contexts.shell.jump-to.utils :as utils]))
 
 (defn home-stack
   [shared-values {:keys [width height]}]
diff --git a/src/status_im2/contexts/shell/components/home_stack/view.cljs b/src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs
similarity index 82%
rename from src/status_im2/contexts/shell/components/home_stack/view.cljs
rename to src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs
index ff9544d392..915fa84c1d 100644
--- a/src/status_im2/contexts/shell/components/home_stack/view.cljs
+++ b/src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs
@@ -1,12 +1,12 @@
-(ns status-im2.contexts.shell.components.home-stack.view
+(ns status-im2.contexts.shell.jump-to.components.home-stack.view
   (:require [react-native.reanimated :as reanimated]
             [status-im.ui.screens.wallet.accounts.views :as wallet.accounts]
             [status-im2.contexts.chat.home.view :as chat]
-            [status-im2.contexts.shell.state :as state]
-            [status-im2.contexts.shell.utils :as utils]
+            [status-im2.contexts.shell.jump-to.state :as state]
+            [status-im2.contexts.shell.jump-to.utils :as utils]
             [status-im2.contexts.communities.home.view :as communities]
-            [status-im2.contexts.shell.constants :as shell.constants]
-            [status-im2.contexts.shell.components.home-stack.style :as style]
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]
+            [status-im2.contexts.shell.jump-to.components.home-stack.style :as style]
             [status-im.ui.screens.browser.stack :as browser.stack]))
 
 (defn load-stack?
diff --git a/src/status_im2/contexts/shell/components/shell_screen/style.cljs b/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/style.cljs
similarity index 91%
rename from src/status_im2/contexts/shell/components/shell_screen/style.cljs
rename to src/status_im2/contexts/shell/jump_to/components/jump_to_screen/style.cljs
index 35688be695..35b7599917 100644
--- a/src/status_im2/contexts/shell/components/shell_screen/style.cljs
+++ b/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/style.cljs
@@ -1,6 +1,6 @@
-(ns status-im2.contexts.shell.components.shell-screen.style
+(ns status-im2.contexts.shell.jump-to.components.jump-to-screen.style
   (:require [quo2.foundations.colors :as colors]
-            [status-im2.contexts.shell.utils :as utils]))
+            [status-im2.contexts.shell.jump-to.utils :as utils]))
 
 ;;;; Placeholder
 (defn placeholder-container
diff --git a/src/status_im2/contexts/shell/components/shell_screen/view.cljs b/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/view.cljs
similarity index 88%
rename from src/status_im2/contexts/shell/components/shell_screen/view.cljs
rename to src/status_im2/contexts/shell/jump_to/components/jump_to_screen/view.cljs
index 64c01d22d0..da98482288 100644
--- a/src/status_im2/contexts/shell/components/shell_screen/view.cljs
+++ b/src/status_im2/contexts/shell/jump_to/components/jump_to_screen/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im2.contexts.shell.components.shell-screen.view
+(ns status-im2.contexts.shell.jump-to.components.jump-to-screen.view
   (:require [utils.i18n :as i18n]
             [quo2.core :as quo]
             [quo2.foundations.colors :as colors]
@@ -8,13 +8,13 @@
             [react-native.blur :as blur]
             [react-native.linear-gradient :as linear-gradient]
             [react-native.safe-area :as safe-area]
-            [status-im2.contexts.shell.state :as state]
-            [status-im2.contexts.shell.utils :as utils]
+            [status-im2.contexts.shell.jump-to.state :as state]
+            [status-im2.contexts.shell.jump-to.utils :as utils]
             [status-im2.common.home.view :as common.home]
-            [status-im2.contexts.shell.constants :as shell.constants]
-            [status-im2.contexts.shell.components.shell-screen.style :as style]
-            [status-im2.contexts.shell.components.bottom-tabs.view :as bottom-tabs]
-            [status-im2.contexts.shell.components.switcher-cards.view :as switcher-cards]))
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]
+            [status-im2.contexts.shell.jump-to.components.jump-to-screen.style :as style]
+            [status-im2.contexts.shell.jump-to.components.bottom-tabs.view :as bottom-tabs]
+            [status-im2.contexts.shell.jump-to.components.switcher-cards.view :as switcher-cards]))
 
 (defn placeholder
   []
diff --git a/src/status_im2/contexts/shell/components/switcher_cards/style.cljs b/src/status_im2/contexts/shell/jump_to/components/switcher_cards/style.cljs
similarity index 97%
rename from src/status_im2/contexts/shell/components/switcher_cards/style.cljs
rename to src/status_im2/contexts/shell/jump_to/components/switcher_cards/style.cljs
index d95f48558e..9f2915198d 100644
--- a/src/status_im2/contexts/shell/components/switcher_cards/style.cljs
+++ b/src/status_im2/contexts/shell/jump_to/components/switcher_cards/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im2.contexts.shell.components.switcher-cards.style
+(ns status-im2.contexts.shell.jump-to.components.switcher-cards.style
   (:require [quo2.foundations.colors :as colors]))
 
 (def colors-map
diff --git a/src/status_im2/contexts/shell/components/switcher_cards/view.cljs b/src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs
similarity index 96%
rename from src/status_im2/contexts/shell/components/switcher_cards/view.cljs
rename to src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs
index aa962ce82d..d65dcd269f 100644
--- a/src/status_im2/contexts/shell/components/switcher_cards/view.cljs
+++ b/src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im2.contexts.shell.components.switcher-cards.view
+(ns status-im2.contexts.shell.jump-to.components.switcher-cards.view
   (:require [clojure.string :as string]
             [utils.i18n :as i18n]
             [quo2.core :as quo]
@@ -8,9 +8,9 @@
             [react-native.core :as rn]
             [react-native.fast-image :as fast-image]
             [status-im2.constants :as constants]
-            [status-im2.contexts.shell.animation :as animation]
-            [status-im2.contexts.shell.constants :as shell.constants]
-            [status-im2.contexts.shell.components.switcher-cards.style :as style]
+            [status-im2.contexts.shell.jump-to.animation :as animation]
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]
+            [status-im2.contexts.shell.jump-to.components.switcher-cards.style :as style]
             [status-im2.contexts.chat.messages.resolver.message-resolver :as resolver]))
 
 (defn content-container
diff --git a/src/status_im2/contexts/shell/constants.cljs b/src/status_im2/contexts/shell/jump_to/constants.cljs
similarity index 97%
rename from src/status_im2/contexts/shell/constants.cljs
rename to src/status_im2/contexts/shell/jump_to/constants.cljs
index 321443b7da..927dd049d4 100644
--- a/src/status_im2/contexts/shell/constants.cljs
+++ b/src/status_im2/contexts/shell/jump_to/constants.cljs
@@ -1,4 +1,4 @@
-(ns status-im2.contexts.shell.constants)
+(ns status-im2.contexts.shell.jump-to.constants)
 
 (def ^:const shell-animation-time 200)
 (def ^:const switcher-card-size 160)
diff --git a/src/status_im2/contexts/shell/events.cljs b/src/status_im2/contexts/shell/jump_to/events.cljs
similarity index 96%
rename from src/status_im2/contexts/shell/events.cljs
rename to src/status_im2/contexts/shell/jump_to/events.cljs
index e33a0112b4..d36105e400 100644
--- a/src/status_im2/contexts/shell/events.cljs
+++ b/src/status_im2/contexts/shell/jump_to/events.cljs
@@ -1,14 +1,14 @@
-(ns status-im2.contexts.shell.events
+(ns status-im2.contexts.shell.jump-to.events
   (:require [utils.re-frame :as rf]
             [re-frame.core :as re-frame]
             [status-im2.config :as config]
             [status-im.utils.core :as utils]
             [status-im2.constants :as constants]
-            [status-im2.contexts.shell.state :as state]
-            [status-im2.contexts.shell.utils :as shell.utils]
+            [status-im2.contexts.shell.jump-to.state :as state]
+            [status-im2.contexts.shell.jump-to.utils :as shell.utils]
             [status-im2.navigation.state :as navigation.state]
-            [status-im2.contexts.shell.animation :as animation]
-            [status-im2.contexts.shell.constants :as shell.constants]
+            [status-im2.contexts.shell.jump-to.animation :as animation]
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]
             [status-im.data-store.switcher-cards :as switcher-cards-store]))
 
 ;;;; Effects
diff --git a/src/status_im2/contexts/shell/shared_values.cljs b/src/status_im2/contexts/shell/jump_to/shared_values.cljs
similarity index 96%
rename from src/status_im2/contexts/shell/shared_values.cljs
rename to src/status_im2/contexts/shell/jump_to/shared_values.cljs
index f294c95b82..6d4058fa0f 100644
--- a/src/status_im2/contexts/shell/shared_values.cljs
+++ b/src/status_im2/contexts/shell/jump_to/shared_values.cljs
@@ -1,11 +1,11 @@
-(ns status-im2.contexts.shell.shared-values
+(ns status-im2.contexts.shell.jump-to.shared-values
   (:require [quo2.foundations.colors :as colors]
             [react-native.safe-area :as safe-area]
             [react-native.reanimated :as reanimated]
             [utils.worklets.shell :as worklets.shell]
-            [status-im2.contexts.shell.utils :as utils]
-            [status-im2.contexts.shell.state :as state]
-            [status-im2.contexts.shell.constants :as shell.constants]))
+            [status-im2.contexts.shell.jump-to.utils :as utils]
+            [status-im2.contexts.shell.jump-to.state :as state]
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]))
 
 (defn calculate-home-stack-position
   [{:keys [width height]}]
diff --git a/src/status_im2/contexts/shell/state.cljs b/src/status_im2/contexts/shell/jump_to/state.cljs
similarity index 81%
rename from src/status_im2/contexts/shell/state.cljs
rename to src/status_im2/contexts/shell/jump_to/state.cljs
index 73625d8fc3..5c9fbbb56a 100644
--- a/src/status_im2/contexts/shell/state.cljs
+++ b/src/status_im2/contexts/shell/jump_to/state.cljs
@@ -1,6 +1,6 @@
-(ns status-im2.contexts.shell.state
+(ns status-im2.contexts.shell.jump-to.state
   (:require [reagent.core :as reagent]
-            [status-im2.contexts.shell.constants :as shell.constants]))
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]))
 
 ;; Atoms
 (def selected-stack-id (atom nil))
diff --git a/src/status_im2/contexts/shell/utils.cljs b/src/status_im2/contexts/shell/jump_to/utils.cljs
similarity index 95%
rename from src/status_im2/contexts/shell/utils.cljs
rename to src/status_im2/contexts/shell/jump_to/utils.cljs
index 30afa0ffbe..1da3337f2a 100644
--- a/src/status_im2/contexts/shell/utils.cljs
+++ b/src/status_im2/contexts/shell/jump_to/utils.cljs
@@ -1,13 +1,13 @@
-(ns status-im2.contexts.shell.utils
+(ns status-im2.contexts.shell.jump-to.utils
   (:require [utils.re-frame :as rf]
             [react-native.core :as rn]
             [status-im2.config :as config]
             [quo2.foundations.colors :as colors]
             [react-native.platform :as platform]
             [react-native.safe-area :as safe-area]
-            [status-im2.contexts.shell.state :as state]
+            [status-im2.contexts.shell.jump-to.state :as state]
             [status-im.async-storage.core :as async-storage]
-            [status-im2.contexts.shell.constants :as shell.constants]))
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]))
 
 ;;;;  Helper Functions
 
diff --git a/src/status_im2/contexts/shell/view.cljs b/src/status_im2/contexts/shell/jump_to/view.cljs
similarity index 72%
rename from src/status_im2/contexts/shell/view.cljs
rename to src/status_im2/contexts/shell/jump_to/view.cljs
index 1a7514da8e..fec118ccc1 100644
--- a/src/status_im2/contexts/shell/view.cljs
+++ b/src/status_im2/contexts/shell/jump_to/view.cljs
@@ -1,19 +1,19 @@
-(ns status-im2.contexts.shell.view
+(ns status-im2.contexts.shell.jump-to.view
   (:require [re-frame.db]
             [quo2.core :as quo]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]
             [react-native.core :as rn]
             [status-im2.config :as config]
-            [status-im2.contexts.shell.utils :as utils]
+            [status-im2.contexts.shell.jump-to.utils :as utils]
             [status-im2.navigation.state :as navigation.state]
-            [status-im2.contexts.shell.animation :as animation]
-            [status-im2.contexts.shell.constants :as shell.constants]
-            [status-im2.contexts.shell.shared-values :as shared-values]
-            [status-im2.contexts.shell.components.home-stack.view :as home-stack]
-            [status-im2.contexts.shell.components.bottom-tabs.view :as bottom-tabs]
-            [status-im2.contexts.shell.components.shell-screen.view :as shell-screen]
-            [status-im2.contexts.shell.components.floating-screens.view :as floating-screens]))
+            [status-im2.contexts.shell.jump-to.animation :as animation]
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]
+            [status-im2.contexts.shell.jump-to.shared-values :as shared-values]
+            [status-im2.contexts.shell.jump-to.components.home-stack.view :as home-stack]
+            [status-im2.contexts.shell.jump-to.components.bottom-tabs.view :as bottom-tabs]
+            [status-im2.contexts.shell.jump-to.components.jump-to-screen.view :as jump-to-screen]
+            [status-im2.contexts.shell.jump-to.components.floating-screens.view :as floating-screens]))
 
 (defn navigate-back-handler
   []
@@ -44,7 +44,7 @@
        #(rn/hw-back-remove-listener navigate-back-handler))
      [])
     [:<>
-     [shell-screen/view customization-color]
+     [jump-to-screen/view customization-color]
      [:f> bottom-tabs/f-bottom-tabs]
      [:f> home-stack/f-home-stack]
      [quo/floating-shell-button
diff --git a/src/status_im2/core.cljs b/src/status_im2/core.cljs
index 864f061013..096812a8b8 100644
--- a/src/status_im2/core.cljs
+++ b/src/status_im2/core.cljs
@@ -9,8 +9,8 @@
     [react-native.platform :as platform]
     [react-native.shake :as react-native-shake]
     [reagent.impl.batching :as batching]
-    [status-im2.contexts.shell.utils :as shell.utils]
-    [status-im2.contexts.shell.state :as shell.state]
+    [status-im2.contexts.shell.jump-to.utils :as shell.utils]
+    [status-im2.contexts.shell.jump-to.state :as shell.state]
     [status-im2.config :as config]
     [status-im2.setup.dev :as dev]
     [status-im2.setup.global-error :as global-error]
diff --git a/src/status_im2/navigation/events.cljs b/src/status_im2/navigation/events.cljs
index 2d9aa05df6..98755ee15e 100644
--- a/src/status_im2/navigation/events.cljs
+++ b/src/status_im2/navigation/events.cljs
@@ -1,7 +1,7 @@
 (ns status-im2.navigation.events
   (:require [utils.re-frame :as rf]
-            [status-im2.contexts.shell.utils :as shell.utils]
-            [status-im2.contexts.shell.events :as shell.events]))
+            [status-im2.contexts.shell.jump-to.utils :as shell.utils]
+            [status-im2.contexts.shell.jump-to.events :as shell.events]))
 
 (defn- all-screens-params
   [db view screen-params]
diff --git a/src/status_im2/navigation/screens.cljs b/src/status_im2/navigation/screens.cljs
index 418058e575..a94510701d 100644
--- a/src/status_im2/navigation/screens.cljs
+++ b/src/status_im2/navigation/screens.cljs
@@ -21,7 +21,7 @@
     [status-im2.contexts.onboarding.enter-seed-phrase.view :as enter-seed-phrase]
     [status-im2.contexts.onboarding.profiles.view :as profiles]
     [status-im2.contexts.quo-preview.main :as quo.preview]
-    [status-im2.contexts.shell.view :as shell]
+    [status-im2.contexts.shell.jump-to.view :as shell]
     [status-im2.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page]
     [status-im2.contexts.syncing.syncing-devices-list.view :as settings-syncing]
     [status-im2.contexts.syncing.how-to-pair.view :as how-to-pair]
diff --git a/src/status_im2/subs/shell.cljs b/src/status_im2/subs/shell.cljs
index 8bcfc14373..2407e30d20 100644
--- a/src/status_im2/subs/shell.cljs
+++ b/src/status_im2/subs/shell.cljs
@@ -5,7 +5,7 @@
             [status-im2.constants :as constants]
             [react-native.platform :as platform]
             [status-im2.common.resources :as resources]
-            [status-im2.contexts.shell.constants :as shell.constants]))
+            [status-im2.contexts.shell.jump-to.constants :as shell.constants]))
 
 ;; Helper Functions
 (defn community-avatar