diff --git a/lib/card10/meson.build b/lib/card10/meson.build
index 085e89929a7e3e04d8bc25a081b22e74b6676766..5c51f5f1014d0e60268073077fb92d0f0eec1918 100644
--- a/lib/card10/meson.build
+++ b/lib/card10/meson.build
@@ -35,30 +35,3 @@ libcard10 = declare_dependency(
   dependencies: deps,
 )
 
-##########################################################
-
-includes = include_directories(
-  './',
-)
-
-sources = files(
-  'mx25lba.c',
-)
-
-deps = [
-    board_card10,
-    periphdriver,
-]
-
-lib = static_library(
-  'mx25lba',
-  sources,
-  include_directories: includes,
-  dependencies: deps,
-)
-
-mx25lba = declare_dependency(
-  include_directories: includes,
-  link_with: lib,
-  dependencies: deps,
-)
diff --git a/lib/meson.build b/lib/meson.build
index ff090b2436271a84606b244303c3d7f735f81dcc..e43c62dbd5ab9b144d6189318973f4db212cb9eb 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -12,4 +12,5 @@ subdir('./FreeRTOS-Plus/')
 subdir('./micropython/')
 
 subdir('./card10/')
+subdir('./mx25lba/')
 subdir('./ff13/')
diff --git a/lib/mx25lba/meson.build b/lib/mx25lba/meson.build
new file mode 100644
index 0000000000000000000000000000000000000000..50a245103815276fe1eb40f55be3c85934f1a1ad
--- /dev/null
+++ b/lib/mx25lba/meson.build
@@ -0,0 +1,25 @@
+includes = include_directories(
+  './',
+)
+
+sources = files(
+  'mx25lba.c',
+)
+
+deps = [
+    board_card10,
+    periphdriver,
+]
+
+lib = static_library(
+  'mx25lba',
+  sources,
+  include_directories: includes,
+  dependencies: deps,
+)
+
+mx25lba = declare_dependency(
+  include_directories: includes,
+  link_with: lib,
+  dependencies: deps,
+)
diff --git a/lib/card10/mx25lba.c b/lib/mx25lba/mx25lba.c
similarity index 94%
rename from lib/card10/mx25lba.c
rename to lib/mx25lba/mx25lba.c
index df13bc1e094f53fc1d946b8510464aca66ec9063..c0af35574ff533979fffca0f7a847eb6d9c7156f 100644
--- a/lib/card10/mx25lba.c
+++ b/lib/mx25lba/mx25lba.c
@@ -35,17 +35,6 @@
  *******************************************************************************
  */
 
-/**
- * @file    mscmem.h
- * @brief   Memory routines used by the USB Mass Storage Class example.
- *          See the msc_mem_t structure in msc.h for function details.
- * @details Functions are provided for using the internal RAM of the
- *          device or the external SPI flash memory.  Use the SPIXF_DISK
- *          and RAM_DISK defines to select the desired memory at compile
- *          time.
- */
-
-#include "mscmem.h"
 #include <string.h>
 #include <stdio.h>
 #include "mx25.h"
diff --git a/lib/card10/mx25lba.h b/lib/mx25lba/mx25lba.h
similarity index 100%
rename from lib/card10/mx25lba.h
rename to lib/mx25lba/mx25lba.h