diff --git a/.gitmodules b/.gitmodules
index 43ab8bc579..1b5c054721 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -109,11 +109,11 @@
 	path = vendor/status-keycard-go
 	url = https://github.com/status-im/status-keycard-go.git
 [submodule "vendor/SortFilterProxyModel"]
-	path = ui/StatusQ/vendor/SortFilterProxyModel
+	path = vendor/SortFilterProxyModel
 	url = https://github.com/status-im/SortFilterProxyModel.git
 [submodule "vendor/nim-taskpools"]
 	path = vendor/nim-taskpools
 	url = https://github.com/status-im/nim-taskpools.git
-[submodule "ui/StatusQ/vendor/qzxing"]
-	path = ui/StatusQ/vendor/qzxing
+[submodule "vendor/qzxing"]
+	path = vendor/qzxing
 	url = https://github.com/status-im/qzxing.git
diff --git a/storybook/CMakeLists.txt b/storybook/CMakeLists.txt
index 30a86b0c0a..be8164a8d8 100644
--- a/storybook/CMakeLists.txt
+++ b/storybook/CMakeLists.txt
@@ -106,4 +106,4 @@ if (APPLE)
   target_link_libraries(${PROJECT_LIB} PRIVATE ${AppKit} ${Foundation})
 endif()
 
-add_subdirectory(../ui/StatusQ/vendor/SortFilterProxyModel ./SortFilterProxyModel)
+add_subdirectory(../vendor/SortFilterProxyModel ./SortFilterProxyModel)
diff --git a/storybook/StoryBook.pro b/storybook/StoryBook.pro
index b27af79d2a..902252c406 100644
--- a/storybook/StoryBook.pro
+++ b/storybook/StoryBook.pro
@@ -66,7 +66,7 @@ QML_IMPORT_PATH += "$$QMLPATHS"
 DEFINES += QML_IMPORT_ROOT=\\\"qrc:/storybook\\\"
 
 #Include SortFilterProxyModel plugin
-include(../ui/StatusQ/vendor/SortFilterProxyModel/SortFilterProxyModel.pri)
+include(../vendor/SortFilterProxyModel/SortFilterProxyModel.pri)
 
 #We need to explicitly set -s TOTAL_MEMORY at least to the linker, otherwise the linking step will fail
 #while validating the resulted .js file
diff --git a/ui/StatusQ/CMakeLists.txt b/ui/StatusQ/CMakeLists.txt
index 502efa9e5f..cc2d77696e 100644
--- a/ui/StatusQ/CMakeLists.txt
+++ b/ui/StatusQ/CMakeLists.txt
@@ -23,8 +23,8 @@ set(QML_IMPORT_PATH
     CACHE STRING "")
 
 
-add_subdirectory(vendor/SortFilterProxyModel)
-add_subdirectory(vendor/qzxing/src)
+add_subdirectory(../../vendor/SortFilterProxyModel SortFilterProxyModel)
+add_subdirectory(../../vendor/qzxing/src qzxing)
 add_subdirectory(sandbox)
 add_subdirectory(sanity_checker)
 add_subdirectory(tests)
diff --git a/vendor/DOtherSide/CMakeLists.txt b/vendor/DOtherSide/CMakeLists.txt
index 5f22c7e8eb..d3ed53130c 100644
--- a/vendor/DOtherSide/CMakeLists.txt
+++ b/vendor/DOtherSide/CMakeLists.txt
@@ -28,8 +28,8 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
     endif()
 endif()
 
-add_subdirectory(../../ui/StatusQ/vendor/qzxing/src qzxing)
-add_subdirectory(../../ui/StatusQ/vendor/SortFilterProxyModel SortFilterProxyModel)
+add_subdirectory(../../vendor/qzxing/src qzxing)
+add_subdirectory(../../vendor/SortFilterProxyModel SortFilterProxyModel)
 add_subdirectory(lib)
 
 if(ENABLE_DOCS)
diff --git a/ui/StatusQ/vendor/SortFilterProxyModel b/vendor/SortFilterProxyModel
similarity index 100%
rename from ui/StatusQ/vendor/SortFilterProxyModel
rename to vendor/SortFilterProxyModel
diff --git a/ui/StatusQ/vendor/qzxing b/vendor/qzxing
similarity index 100%
rename from ui/StatusQ/vendor/qzxing
rename to vendor/qzxing