diff --git a/src/Components/GEOSldas_GridComp/CMakeLists.txt b/src/Components/GEOSldas_GridComp/CMakeLists.txt
index 05ddb49b..d6a7018a 100644
--- a/src/Components/GEOSldas_GridComp/CMakeLists.txt
+++ b/src/Components/GEOSldas_GridComp/CMakeLists.txt
@@ -12,6 +12,6 @@ set (alldirs
 esma_add_library(${this}
   SRCS GEOS_LdasGridComp.F90
   SUBCOMPONENTS ${alldirs}
-  SUBDIRS Shared
+  SUBDIRS LDAS_Shared
   DEPENDENCIES GEOSland_GridComp makebcs MAPL
   INCLUDES ${INC_ESMF})
diff --git a/src/Components/GEOSldas_GridComp/Shared/CMakeLists.txt b/src/Components/GEOSldas_GridComp/LDAS_Shared/CMakeLists.txt
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/CMakeLists.txt
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/CMakeLists.txt
diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_Convert.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_Convert.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/LDAS_Convert.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_Convert.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_DriverTypes.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_DriverTypes.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/LDAS_DriverTypes.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_DriverTypes.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_Exceptions.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_Exceptions.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/LDAS_Exceptions.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_Exceptions.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_PertTypes.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_PertTypes.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/LDAS_PertTypes.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_PertTypes.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_RepairForcing.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_RepairForcing.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/LDAS_RepairForcing.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_RepairForcing.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_TileCoordRoutines.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_TileCoordRoutines.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/LDAS_TileCoordRoutines.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_TileCoordRoutines.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_TileCoordType.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_TileCoordType.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/LDAS_TileCoordType.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_TileCoordType.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_Globals.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_Globals.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_Globals.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_Globals.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_functions.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_functions.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_functions.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_functions.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_mpi.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_mpi.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_mpi.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_mpi.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/catch_types.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/catch_types.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/catch_types.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/catch_types.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/enkf_types.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/enkf_types.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/enkf_types.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/enkf_types.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/my_lu_decomp.f b/src/Components/GEOSldas_GridComp/LDAS_Shared/my_lu_decomp.f
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/my_lu_decomp.f
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/my_lu_decomp.f
diff --git a/src/Components/GEOSldas_GridComp/Shared/my_matrix_functions.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/my_matrix_functions.F90
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/my_matrix_functions.F90
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/my_matrix_functions.F90
diff --git a/src/Components/GEOSldas_GridComp/Shared/nr_indexx.f b/src/Components/GEOSldas_GridComp/LDAS_Shared/nr_indexx.f
similarity index 100%
rename from src/Components/GEOSldas_GridComp/Shared/nr_indexx.f
rename to src/Components/GEOSldas_GridComp/LDAS_Shared/nr_indexx.f