diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 89393d7..e230608 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(OpenAstroFirmware)
 
-zephyr_syscall_include_directories(include)
-zephyr_include_directories(include)
+add_subdirectory_ifdef(CONFIG_MOUNT src/mount)
 
-add_subdirectory(src)
+target_sources(app PRIVATE src/main.cpp)
diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt
deleted file mode 100644
index 09a2dc4..0000000
--- a/app/src/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-target_sources(app PRIVATE
-        main.cpp
-        mount/Mount.cpp
-)
diff --git a/app/src/mount/CMakeLists.txt b/app/src/mount/CMakeLists.txt
new file mode 100644
index 0000000..97b2977
--- /dev/null
+++ b/app/src/mount/CMakeLists.txt
@@ -0,0 +1 @@
+zephyr_library_sources(Mount.cpp)
diff --git a/app/src/mount/Kconfig b/app/src/mount/Kconfig
index 202d30b..5e5e106 100644
--- a/app/src/mount/Kconfig
+++ b/app/src/mount/Kconfig
@@ -1,4 +1,8 @@
-menu "Mount"
+menuconfig MOUNT
+    bool "Mount"
+    default y
+
+if MOUNT
 
 config MOUNT_THREAD_STACK_SIZE
     hex "Mount stack size"
@@ -11,4 +15,4 @@ module = MOUNT
 module-str = mount
 source "subsys/logging/Kconfig.template.log_config"
 
-endmenu
+endif
diff --git a/app/include/mount/Mount.hpp b/include/mount/Mount.hpp
similarity index 100%
rename from app/include/mount/Mount.hpp
rename to include/mount/Mount.hpp