diff --git a/.gitmodules b/.gitmodules
index d253f6966..1f7526633 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "atmos_cubed_sphere"]
 	path = atmos_cubed_sphere
-	url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere
+	url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
 	branch = dev/emc
 [submodule "ccpp/framework"]
 	path = ccpp/framework
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b0947f55..b7fbd2c0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,8 +47,12 @@ list(APPEND _fv3dycore_srcs
   atmos_cubed_sphere/model/tp_core.F90
   atmos_cubed_sphere/model/nh_core.F90
   atmos_cubed_sphere/model/nh_utils.F90
+  atmos_cubed_sphere/tools/coarse_grained_diagnostics.F90
+  atmos_cubed_sphere/tools/coarse_grained_restart_files.F90
+  atmos_cubed_sphere/tools/coarse_graining.F90
   atmos_cubed_sphere/tools/external_ic.F90
   atmos_cubed_sphere/tools/external_sst.F90
+  atmos_cubed_sphere/tools/fv_diag_column.F90
   atmos_cubed_sphere/tools/fv_diagnostics.F90
   atmos_cubed_sphere/tools/fv_eta.F90
   atmos_cubed_sphere/tools/fv_grid_tools.F90
@@ -103,7 +107,8 @@ set_target_properties(fv3dycore PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURR
 
 target_compile_definitions(fv3dycore PRIVATE "${_fv3dycore_defs_private}")
 target_include_directories(fv3dycore PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/atmos_cubed_sphere
-                                             ${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver/mod)
+                                              ${CMAKE_CURRENT_SOURCE_DIR}/atmos_cubed_sphere/tools
+                                              ${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver/mod)
 target_include_directories(fv3dycore INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                                $<INSTALL_INTERFACE:mod>)
 
diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
index 306ff3137..03a7ae7dc 160000
--- a/atmos_cubed_sphere
+++ b/atmos_cubed_sphere
@@ -1 +1 @@
-Subproject commit 306ff31371e74694e5d9f4a57584295c7122b9ac
+Subproject commit 03a7ae7dc0b93ca9eec0f9e133bfceccf004b083
diff --git a/ccpp/physics b/ccpp/physics
index b6ef6c32e..08b72bc1c 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit b6ef6c32e51b4e3c28ca8b49a4e8401f11e55fd9
+Subproject commit 08b72bc1c23c48a823626d81f8e0a398685a35a3