diff --git a/ui/MonitoringSources.cmake b/ui/MonitoringSources.cmake
new file mode 100644
index 0000000000..0018d6d230
--- /dev/null
+++ b/ui/MonitoringSources.cmake
@@ -0,0 +1,11 @@
+set(MONITORING_INCLUDE_PATH ${CMAKE_CURRENT_LIST_DIR}/include)
+
+set(MONITORING_HEADERS
+    ${MONITORING_INCLUDE_PATH}/StatusDesktop/Monitoring/Monitor.h
+    ${MONITORING_INCLUDE_PATH}/StatusDesktop/Monitoring/ContextPropertiesModel.h
+)
+
+set(MONITORING_SOURCES
+    ${CMAKE_CURRENT_LIST_DIR}/src/StatusDesktop/Monitoring/Monitor.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/src/StatusDesktop/Monitoring/ContextPropertiesModel.cpp
+)
diff --git a/vendor/DOtherSide/lib/include/DOtherSide/Status/Monitoring/ContextPropertiesModel.h b/ui/include/StatusDesktop/Monitoring/ContextPropertiesModel.h
similarity index 100%
rename from vendor/DOtherSide/lib/include/DOtherSide/Status/Monitoring/ContextPropertiesModel.h
rename to ui/include/StatusDesktop/Monitoring/ContextPropertiesModel.h
diff --git a/vendor/DOtherSide/lib/include/DOtherSide/Status/Monitoring/Monitor.h b/ui/include/StatusDesktop/Monitoring/Monitor.h
similarity index 100%
rename from vendor/DOtherSide/lib/include/DOtherSide/Status/Monitoring/Monitor.h
rename to ui/include/StatusDesktop/Monitoring/Monitor.h
diff --git a/vendor/DOtherSide/lib/src/Status/Monitoring/ContextPropertiesModel.cpp b/ui/src/StatusDesktop/Monitoring/ContextPropertiesModel.cpp
similarity index 93%
rename from vendor/DOtherSide/lib/src/Status/Monitoring/ContextPropertiesModel.cpp
rename to ui/src/StatusDesktop/Monitoring/ContextPropertiesModel.cpp
index cd6e48b3bc..ab0049c43b 100644
--- a/vendor/DOtherSide/lib/src/Status/Monitoring/ContextPropertiesModel.cpp
+++ b/ui/src/StatusDesktop/Monitoring/ContextPropertiesModel.cpp
@@ -1,4 +1,4 @@
-#include "DOtherSide/Status/Monitoring/ContextPropertiesModel.h"
+#include "StatusDesktop/Monitoring/ContextPropertiesModel.h"
 
 ContextPropertiesModel::ContextPropertiesModel(QObject* parent)
     : QAbstractListModel(parent)
diff --git a/vendor/DOtherSide/lib/src/Status/Monitoring/Monitor.cpp b/ui/src/StatusDesktop/Monitoring/Monitor.cpp
similarity index 98%
rename from vendor/DOtherSide/lib/src/Status/Monitoring/Monitor.cpp
rename to ui/src/StatusDesktop/Monitoring/Monitor.cpp
index aca79e2615..3bbda94926 100644
--- a/vendor/DOtherSide/lib/src/Status/Monitoring/Monitor.cpp
+++ b/ui/src/StatusDesktop/Monitoring/Monitor.cpp
@@ -1,4 +1,4 @@
-#include "DOtherSide/Status/Monitoring/Monitor.h"
+#include "StatusDesktop/Monitoring/Monitor.h"
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/vendor/DOtherSide/CMakeLists.txt b/vendor/DOtherSide/CMakeLists.txt
index f7690915c1..d4b174098e 100644
--- a/vendor/DOtherSide/CMakeLists.txt
+++ b/vendor/DOtherSide/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.19)
 
 project(DOtherSide)
 
diff --git a/vendor/DOtherSide/lib/CMakeLists.txt b/vendor/DOtherSide/lib/CMakeLists.txt
index d8f7df9d1f..6c96a280c3 100644
--- a/vendor/DOtherSide/lib/CMakeLists.txt
+++ b/vendor/DOtherSide/lib/CMakeLists.txt
@@ -7,23 +7,21 @@ set(MONITORING_QML_ENTRY_POINT "" CACHE STRING "QML file intended to start the m
 
 include(../../../ui/StatusQ/StatusQSources.cmake)
 
+if(MONITORING)
+    include(../../../ui/MonitoringSources.cmake)
+endif()
+
 # Macro for merging common code between static and shared
 macro(add_target name type)
     find_package(Qt5 COMPONENTS Core Qml Gui Quick QuickControls2 Widgets Network Multimedia REQUIRED)
 
     file(GLOB HEADERS include/DOtherSide/*.h include/DOtherSide/Status/*.h)
-
     file(GLOB SOURCES src/*.cpp src/Status/*.cpp)
 
-    if(MONITORING)
-        file(GLOB MONITORING_HEADERS include/DOtherSide/Status/Monitoring/*.h)
-        file(GLOB MONITORING_SOURCES src/Status/Monitoring/*.cpp)
-    endif()
-
     if(APPLE)
         file(GLOB MM_FILES src/*.mm src/Status/*.mm)
         #prepend items because .mm files need build priority to override cpp impl
-        list(INSERT SOURCES 0 ${MM_FILES})
+        list(PREPEND SOURCES ${MM_FILES})
     endif()
 
     add_library(${name} ${type}
@@ -48,6 +46,8 @@ macro(add_target name type)
     endif()
 
     if(MONITORING)
+        target_include_directories(${name} PUBLIC ${MONITORING_INCLUDE_PATH})
+
         target_compile_definitions(${name} PRIVATE MONITORING)
         target_compile_definitions(${name} PRIVATE MONITORING_QML_ENTRY_POINT="${MONITORING_QML_ENTRY_POINT}")
     endif()
diff --git a/vendor/DOtherSide/lib/src/DOtherSide.cpp b/vendor/DOtherSide/lib/src/DOtherSide.cpp
index 0f10e05d9c..d34fb1565c 100644
--- a/vendor/DOtherSide/lib/src/DOtherSide.cpp
+++ b/vendor/DOtherSide/lib/src/DOtherSide.cpp
@@ -79,7 +79,7 @@
 
 #ifdef MONITORING
 #include <QProcessEnvironment>
-#include "DOtherSide/Status/Monitoring/Monitor.h"
+#include "StatusDesktop/Monitoring/Monitor.h"
 #endif
 
 #include <qqmlsortfilterproxymodeltypes.h>