diff --git a/c/src/lib/libbsp/shared/umon/README b/bsps/arm/csb337/umon/README
similarity index 100%
rename from c/src/lib/libbsp/shared/umon/README
rename to bsps/arm/csb337/umon/README
diff --git a/c/src/lib/libbsp/shared/umon/doxygen.h b/bsps/arm/csb337/umon/doxygen.h
similarity index 100%
rename from c/src/lib/libbsp/shared/umon/doxygen.h
rename to bsps/arm/csb337/umon/doxygen.h
diff --git a/c/src/lib/libbsp/shared/umon/monlib.c b/bsps/arm/csb337/umon/monlib.c
similarity index 100%
rename from c/src/lib/libbsp/shared/umon/monlib.c
rename to bsps/arm/csb337/umon/monlib.c
diff --git a/c/src/lib/libbsp/shared/umon/tfsDriver.c b/bsps/arm/csb337/umon/tfsDriver.c
similarity index 100%
rename from c/src/lib/libbsp/shared/umon/tfsDriver.c
rename to bsps/arm/csb337/umon/tfsDriver.c
diff --git a/c/src/lib/libbsp/shared/umon/umoncons.c b/bsps/arm/csb337/umon/umoncons.c
similarity index 100%
rename from c/src/lib/libbsp/shared/umon/umoncons.c
rename to bsps/arm/csb337/umon/umoncons.c
diff --git a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c b/bsps/arm/csb337/umon/umonrtemsglue.c
similarity index 100%
rename from c/src/lib/libbsp/shared/umon/umonrtemsglue.c
rename to bsps/arm/csb337/umon/umonrtemsglue.c
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 9a99d69cb1..38382de004 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -8,9 +8,6 @@ dist_project_lib_DATA = startup/bsp_specs
 if ENABLE_LCD
 endif
 
-if ENABLE_UMON
-endif
-
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -61,12 +58,12 @@ libbsp_a_SOURCES += console/sed1356.c console/fbcons.c
 endif
 # umon
 if ENABLE_UMON
-libbsp_a_SOURCES += ../../shared/umon/umonrtemsglue.c  \
-    ../../shared/umon/monlib.c ../../shared/umon/tfsDriver.c \
-    ../../shared/umon/umoncons.c startup/umonsupp.c
+libbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/umon/monlib.c
+libbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/umon/tfsDriver.c
+libbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/umon/umonrtemsglue.c
 endif
 if ENABLE_UMON_CONSOLE
-libbsp_a_SOURCES += ../../shared/umon/umoncons.c
+libbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/umon/umoncons.c
 endif
 
 # Cache