diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
index 823c67719..80bb47bce 100644
--- a/.buildkite/longruns/pipeline.yml
+++ b/.buildkite/longruns/pipeline.yml
@@ -36,9 +36,9 @@ steps:
       - "rm -f ${JULIA_DEPOT_PATH}/environments/v1.9/LocalPreferences.toml"
 
       - echo "--- Instantiate AMIP env"
-      - "julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
-      - "julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.precompile()'"
-      - "julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.status()'"
+      - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
+      - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.precompile()'"
+      - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.status()'"
 
       - echo "--- Download artifacts"
       - "julia --project=artifacts -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
@@ -66,8 +66,8 @@ steps:
       # Integration tests - the expected results were also confirmed locally
       - label: "Slabplanet_aqua: nocouple"
         key: "slabplanet_aqua_atmos_sf_nocouple" # SF at each Atmos stage, no coupling, prescribed SST from atmos
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_aqua_atmos_sf_nocouple.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet_aqua/slabplanet_aqua_atmos_sf_nocouple_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_atmos_sf_nocouple.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_atmos_sf_nocouple_artifacts/*"
         env:
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -77,8 +77,8 @@ steps:
 
       - label: "Slabplanet_aqua: couple"
         key: "slabplanet_aqua_atmos_sf_couple" # SF at each Atmos stage, coupling, prescribed SST from coupler - identical results to the above confirm 1) initial conditions in Atmos are unchanged compared to the slab, 2) coupling not introducing variability when constant surface
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_aqua_atmos_sf_couple.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet_aqua/slabplanet_aqua_atmos_sf_couple_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_atmos_sf_couple.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_atmos_sf_couple_artifacts/*"
         env:
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -88,8 +88,8 @@ steps:
 
       - label: "Slabplanet_aqua: coupler fluxes"
         key: "slabplanet_aqua_coupler_sf" # SF at each coupler timestep, constant ocean - comparing to the above runs, this tests the sensitivity of less frequent flux calculation
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_aqua_coupler_sf.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet_aqua/slabplanet_aqua_coupler_sf_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_coupler_sf.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_coupler_sf_artifacts/*"
         env:
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -99,8 +99,8 @@ steps:
 
       - label: "Slabplanet_aqua: coupler fluxes, evolving ocean"
         key: "slabplanet_aqua_coupler_sf_evolve_ocn" # SF at each coupler timestep, evolving ocean - comparing to the above run, tests the sensitivity of evolving ocean
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_aqua_coupler_sf_evolve_ocn.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet_aqua/slabplanet_aqua_coupler_sf_evolve_ocn_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_coupler_sf_evolve_ocn.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_coupler_sf_evolve_ocn_artifacts/*"
         env:
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -110,8 +110,8 @@ steps:
 
       - label: "Slabplanet_terra: coupler fluxes, evolving bucket"
         key: "slabplanet_terra" # SF at each coupler timestep, evolving ocean - comparing to the above run, tests the sensitivity of evolving bucket
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_terra.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet_terra/slabplanet_terra_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_terra.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet_terra/slabplanet_terra_artifacts/*"
         env:
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -121,8 +121,8 @@ steps:
 
       - label: "Slabplanet: coupler fluxes, evolving ocean and land"
         key: "slabplanet_coupler_sf_evolve_ocn"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_coupler_sf_evolve_ocn.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_coupler_sf_evolve_ocn.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/*"
         env:
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -136,7 +136,7 @@ steps:
 
       - label: "ClimaAtmos standalone target"
         command:
-          - srun julia --project=experiments/AMIP/modular/ target/atmos_driver.jl --config_file target/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation.yml
+          - srun julia --project=experiments/AMIP/ target/atmos_driver.jl --config_file target/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation.yml
         artifact_paths: "longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation/*"
         env:
           BUILD_HISTORY_HANDLE: ""
@@ -148,8 +148,8 @@ steps:
 
       - label: "TARGET IDEALIZED: new target aqua - fixed ocean T, nocouple, atmos flux calc"
         key: "slabplanet_aqua_target_nocouple"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_aqua_target_nocouple.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet_aqua/slabplanet_aqua_target_nocouple_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_target_nocouple.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_target_nocouple_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -160,8 +160,8 @@ steps:
 
       - label: "TARGET IDEALIZED: new target aqua - fixed ocean T, coupler flux calc"
         key: "slabplanet_aqua_target"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_aqua_target.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet_aqua/slabplanet_aqua_target_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_target.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_target_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -172,8 +172,8 @@ steps:
 
       - label: "TARGET IDEALIZED: new target aqua - evolving slab ocean T"
         key: "slabplanet_aqua_target_evolve_ocn"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_aqua_target_evolve_ocn.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet_aqua/slabplanet_aqua_target_evolve_ocn_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_target_evolve_ocn.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_target_evolve_ocn_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -184,8 +184,8 @@ steps:
 
       - label: "TARGET IDEALIZED: new target slab - fixed ocean T, bucket"
         key: "slabplanet_target"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_target.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/slabplanet_target_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_target.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_target_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -196,8 +196,8 @@ steps:
 
       - label: "TARGET IDEALIZED: new target slab - evolving slab ocean T, bucket"
         key: "slabplanet_target_evolve_ocn"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_target_evolve_ocn.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/slabplanet_target_evolve_ocn_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_target_evolve_ocn.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_target_evolve_ocn_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -213,8 +213,8 @@ steps:
 
       - label: "MPI AMIP FINE: new target amip"
         key: "amip_target"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/amip_target.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/amip_target_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_target.yml"
+        artifact_paths: "experiments/AMIP/output/amip/amip_target_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -225,8 +225,8 @@ steps:
 
       - label: "MPI AMIP FINE: new target amip: topo"
         key: "amip_target_topo"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/amip_target_topo.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/amip_target_topo_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_target_topo.yml"
+        artifact_paths: "experiments/AMIP/output/amip/amip_target_topo_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -244,8 +244,8 @@ steps:
 
       - label: "MPI AMIP SUPERFINE: dyamond_target"
         key: "dyamond_target"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/dyamond_target.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/dyamond_target_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/dyamond_target.yml"
+        artifact_paths: "experiments/AMIP/output/amip/dyamond_target_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -257,8 +257,8 @@ steps:
       # mid-resolution AMIP: MPI performance scaling (10 days)
       - label: "MPI AMIP FINE: n64"
         key: "mpi_amip_fine_n64"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/amip_n64_shortrun.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/amip_n64_shortrun_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_n64_shortrun.yml"
+        artifact_paths: "experiments/AMIP/output/amip/amip_n64_shortrun_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -269,8 +269,8 @@ steps:
 
       - label: "MPI AMIP FINE: n32"
         key: "mpi_amip_fine_n32"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/amip_n32_shortrun.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/amip_n32_shortrun_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_n32_shortrun.yml"
+        artifact_paths: "experiments/AMIP/output/amip/amip_n32_shortrun_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -281,8 +281,8 @@ steps:
 
       - label: "MPI AMIP FINE: n8"
         key: "mpi_amip_fine_n8"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/amip_n8_shortrun.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/amip_n8_shortrun_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_n8_shortrun.yml"
+        artifact_paths: "experiments/AMIP/output/amip/amip_n8_shortrun_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -293,8 +293,8 @@ steps:
 
       - label: "MPI AMIP FINE: n2" # 10d take 21h, so reducing to 1d
         key: "mpi_amip_fine_n2"
-        command: "mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/amip_n2_shortrun.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/amip_n2_shortrun_artifacts/*"
+        command: "mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_n2_shortrun.yml"
+        artifact_paths: "experiments/AMIP/output/amip/amip_n2_shortrun_artifacts/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
           BUILD_HISTORY_HANDLE: ""
@@ -305,8 +305,8 @@ steps:
 
       - label: "MPI AMIP FINE: n1" # also reported by longruns with a flame graph; 10d take 21h, so reducing to 1d
         key: "mpi_amip_fine_n1"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/amip_n1_shortrun.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/amip_n1_shortrun_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_n1_shortrun.yml"
+        artifact_paths: "experiments/AMIP/output/amip/amip_n1_shortrun_artifacts/*"
         env:
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -316,8 +316,8 @@ steps:
 
       - label: "MPI AMIP FINE: n1 no couple" # sim time = Δt_cpl (~ benchmarking with standalone models)
         key: "mpi_amip_fine_n1_nocouple"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/amip_n1_shortrun_nocouple.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/amip_n1_shortrun_nocouple_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_n1_shortrun_nocouple.yml"
+        artifact_paths: "experiments/AMIP/output/amip/amip_n1_shortrun_nocouple_artifacts/*"
         env:
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -351,14 +351,14 @@ steps:
 
       - label: ":envelope: Slack report: Slabplanet"
         command:
-          - slack-upload -c "#coupler-report" -f experiments/AMIP/modular/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/total_energy_log_bucket.png -m png -n slab_coarse_log -x "Slabplanet energy conservation (log error)"
-          - slack-upload -c "#coupler-report" -f experiments/AMIP/modular/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/total_energy_bucket.png -m png -n slab_coarse -x "Slabplanet energy conservation"
-          - slack-upload -c "#coupler-report" -f experiments/AMIP/modular/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/total_water_log_bucket.png -m png -n slab_coarse_w_log -x "Slabplanet water conservation (log error)"
-          - slack-upload -c "#coupler-report" -f experiments/AMIP/modular/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/total_water_bucket.png -m png -n slab_coarse_w -x "Slabplanet water conservation"
+          - slack-upload -c "#coupler-report" -f experiments/AMIP/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/total_energy_log_bucket.png -m png -n slab_coarse_log -x "Slabplanet energy conservation (log error)"
+          - slack-upload -c "#coupler-report" -f experiments/AMIP/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/total_energy_bucket.png -m png -n slab_coarse -x "Slabplanet energy conservation"
+          - slack-upload -c "#coupler-report" -f experiments/AMIP/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/total_water_log_bucket.png -m png -n slab_coarse_w_log -x "Slabplanet water conservation (log error)"
+          - slack-upload -c "#coupler-report" -f experiments/AMIP/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/total_water_bucket.png -m png -n slab_coarse_w -x "Slabplanet water conservation"
 
       - label: ":envelope: Slack report: target AMIP"
         command:
-          - slack-upload -c "#coupler-report" -f experiments/AMIP/modular/output/amip/amip_target_artifacts/amip_paperplots.png -m png -n amip_fine -x "AMIP Target Longrun"
+          - slack-upload -c "#coupler-report" -f experiments/AMIP/output/amip/amip_target_artifacts/amip_paperplots.png -m png -n amip_fine -x "AMIP Target Longrun"
 
       - label: ":envelope: Slack report: Flame Diff"
         command:
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 0db435379..c6ad34598 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -51,10 +51,10 @@ steps:
       - "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.precompile()'"
       - "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.status()'"
 
-      - echo "--- Instantiate amip modular"
-      - "julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
-      - "julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.precompile()'"
-      - "julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.status()'"
+      - echo "--- Instantiate AMIP env"
+      - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
+      - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.precompile()'"
+      - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.status()'"
 
       - echo "--- Instantiate perf env"
       - "julia --project=perf/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
@@ -138,56 +138,56 @@ steps:
       #   - diagnostics: check and plot energy conservation, output plots after 9 days
       - label: "Slabplanet: default"
         key: "slabplanet_default"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_default.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/slabplanet_default_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_default.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_default_artifacts/*"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: default with Float32"
         key: "slabplanet_ft32"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_ft32.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/slabplanet_ft32_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_ft32.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_ft32_artifacts/*"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: partitioned turbulent fluxes"
         key: "slabplanet_partitioned_fluxes"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_partitioned_fluxes.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/slabplanet_partitioned_fluxes_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_partitioned_fluxes.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_partitioned_fluxes_artifacts/*"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: non-monotonous surface remap"
         key: "slabplanet_non-monotonous"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_nonmono.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/slabplanet_nonmono_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_nonmono.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_nonmono_artifacts/*"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: albedo from static map"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_albedo_static_map.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/slabplanet_albedo_static_map_artifacts/total_energy*.png"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_albedo_static_map.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_albedo_static_map_artifacts/total_energy*.png"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: albedo from temporal map"
         key: "slabplanet_albedo_map_temporal"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_albedo_temporal_map.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/slabplanet_albedo_temporal_map_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_albedo_temporal_map.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_albedo_temporal_map_artifacts/*"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: albedo from function"
         key: "slabplanet_albedo_function"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_albedo_function.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/slabplanet_albedo_function_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_albedo_function.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_albedo_function_artifacts/*"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: eisenman sea ice"
         key: "slabplanet_eisenman"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/slabplanet_eisenman.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet_eisenman/slabplanet_eisenman_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_eisenman.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet_eisenman/slabplanet_eisenman_artifacts/*"
         agents:
           slurm_mem: 20GB
 
@@ -200,9 +200,9 @@ steps:
 
       # slabplanet default: track unthreaded performance (alloc tests, flame graph, flame graph diff, build history)
       - label: ":rocket: Slabplanet: default (unthreaded)"
-        key: "modular_slabplanet_unthreaded"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/default_modular_unthreaded.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/default_modular_unthreaded_artifacts/*"
+        key: "slabplanet_unthreaded"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/default_unthreaded.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/default_unthreaded_artifacts/*"
         env:
           FLAME_PLOT: ""
           BUILD_HISTORY_HANDLE: ""
@@ -211,14 +211,14 @@ steps:
           slurm_mem: 20GB
 
       - label: ":rocket: Slabplanet: default (unthreaded) - flame graph and allocation tests"
-        command: "julia --color=yes --project=perf perf/flame.jl --config_file $PERF_CONFIG_PATH/perf_default_modular_unthreaded.yml"
-        artifact_paths: "perf/output/perf_default_modular_unthreaded/*"
+        command: "julia --color=yes --project=perf perf/flame.jl --config_file $PERF_CONFIG_PATH/perf_default_unthreaded.yml"
+        artifact_paths: "perf/output/perf_default_unthreaded/*"
         agents:
           slurm_mem: 20GB
 
       - label: ":rocket: Slabplanet: default (unthreaded) - flame graph diff"
-        command: "julia --color=yes --project=perf perf/flame_diff.jl --config_file $PERF_CONFIG_PATH/perf_diff_default_modular_unthreaded.yml"
-        artifact_paths: "perf/output/perf_diff_default_modular_unthreaded/*"
+        command: "julia --color=yes --project=perf perf/flame_diff.jl --config_file $PERF_CONFIG_PATH/perf_diff_default_unthreaded.yml"
+        artifact_paths: "perf/output/perf_diff_default_unthreaded/*"
         agents:
           slurm_mem: 20GB
 
@@ -241,42 +241,42 @@ steps:
       # AMIP AND SLABPLANET EXPERIMENTS
 
       - label: "Moist earth with slab surface - default: monin gray no_sponge idealinsol freq_dt_cpl"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/default_mono.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/default_mono_artifacts/total_energy*.png"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/default_mono.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/default_mono_artifacts/total_energy*.png"
         agents:
           slurm_mem: 20GB
 
       - label: "Moist earth with slab surface - notmono: monin gray no_sponge idealinsol freq_dt_cpl notmono"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/default_notmono.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/default_notmono_artifacts/total_energy*.png"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/default_notmono.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/default_notmono_artifacts/total_energy*.png"
         agents:
           slurm_mem: 20GB
 
       # - label: "Moist earth with slab surface - test: monin allsky sponge idealinsol infreq_dt_cpl"
-        # command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --FLOAT_TYPE Float64 --coupled true --surface_setup PrescribedSurface --moist equil --vert_diff true --rad allskywithclear --rayleigh_sponge true --alpha_rayleigh_uh 0 --alpha_rayleigh_w 10 --energy_check true --mode_name slabplanet --t_end 10days --dt_save_to_sol 3600secs --dt_cpl 21600 --dt 200secs --dt_rad 6hours --mono_surface true --h_elem 4 --precip_model 0M --run_name target_params_in_slab_test1 --job_id target_params_in_slab_test1" # Unconverged SF (reproduced locally); works with 200s dt_cpl
-        # artifact_paths: "experiments/AMIP/modular/output/slabplanet/target_params_in_slab_test1_artifacts/total_energy*.png"
+        # command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --FLOAT_TYPE Float64 --coupled true --surface_setup PrescribedSurface --moist equil --vert_diff true --rad allskywithclear --rayleigh_sponge true --alpha_rayleigh_uh 0 --alpha_rayleigh_w 10 --energy_check true --mode_name slabplanet --t_end 10days --dt_save_to_sol 3600secs --dt_cpl 21600 --dt 200secs --dt_rad 6hours --mono_surface true --h_elem 4 --precip_model 0M --run_name target_params_in_slab_test1 --job_id target_params_in_slab_test1" # Unconverged SF (reproduced locally); works with 200s dt_cpl
+        # artifact_paths: "experiments/AMIP/output/slabplanet/target_params_in_slab_test1_artifacts/total_energy*.png"
 
       - label: "Moist earth with slab surface - test: bulk allsky sponge realinsol infreq_dt_cpl"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/target_params_in_slab_test2.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/target_params_in_slab_test2_artifacts/total_energy*.png"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/target_params_in_slab_test2.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/target_params_in_slab_test2_artifacts/total_energy*.png"
         agents:
           slurm_mem: 20GB
 
       - label: "Moist earth with slab surface - test: monin gray sponge realinsol infreq_dt_cpl"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/target_params_in_slab_test3.yml"
-        artifact_paths: "experiments/AMIP/modular/output/slabplanet/target_params_in_slab_test3_artifacts/total_energy*.png"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/target_params_in_slab_test3.yml"
+        artifact_paths: "experiments/AMIP/output/slabplanet/target_params_in_slab_test3_artifacts/total_energy*.png"
         agents:
           slurm_mem: 20GB
 
       # breaking:
       # - label: "Moist earth with slab surface - monin allsky no_sponge idealinsol infreq_dt_cpl"
-      #   command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --coupled true --surface_setup PrescribedSurface --moist equil --vert_diff true --rad allskywithclear --rayleigh_sponge false --energy_check true --mode_name slabplanet --t_end 10days --dt_save_to_sol 3600secs --dt_cpl 21600 --dt 200secs --dt_rad 6hours --idealized_insolation true --mono_surface true --h_elem 4 --precip_model 0M --run_name target_params_in_slab1"
-      #   artifact_paths: "experiments/AMIP/modular/output/slabplanet/target_params_in_slab1_artifacts/total_energy*.png"
+      #   command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --coupled true --surface_setup PrescribedSurface --moist equil --vert_diff true --rad allskywithclear --rayleigh_sponge false --energy_check true --mode_name slabplanet --t_end 10days --dt_save_to_sol 3600secs --dt_cpl 21600 --dt 200secs --dt_rad 6hours --idealized_insolation true --mono_surface true --h_elem 4 --precip_model 0M --run_name target_params_in_slab1"
+      #   artifact_paths: "experiments/AMIP/output/slabplanet/target_params_in_slab1_artifacts/total_energy*.png"
 
-      - label: "AMIP - modular Float64 + hourly checkpoint"
-        key: "modular_amip"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/coarse_single_modular_ft64_hourly_checkpoints.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/coarse_single_modular_ft64_hourly_checkpoints_artifacts/*"
+      - label: "AMIP - Float64 + hourly checkpoint"
+        key: "amip"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/coarse_single_ft64_hourly_checkpoints.yml"
+        artifact_paths: "experiments/AMIP/output/amip/coarse_single_ft64_hourly_checkpoints_artifacts/*"
         env:
           FLAME_PLOT: ""
           BUILD_HISTORY_HANDLE: ""
@@ -284,10 +284,10 @@ steps:
           slurm_ntasks: 1
           slurm_mem: 20GB
 
-      - label: "AMIP - modular Float64 + hourly checkpoint + co2"
-        key: "coarse_single_modular_ft64_hourly_checkpoints_co2"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/coarse_single_modular_ft64_hourly_checkpoints_co2.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/coarse_single_modular_ft64_hourly_checkpoints_co2_artifacts/*"
+      - label: "AMIP - Float64 + hourly checkpoint + co2"
+        key: "coarse_single_ft64_hourly_checkpoints_co2"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/coarse_single_ft64_hourly_checkpoints_co2.yml"
+        artifact_paths: "experiments/AMIP/output/amip/coarse_single_ft64_hourly_checkpoints_co2_artifacts/*"
         env:
           FLAME_PLOT: ""
           BUILD_HISTORY_HANDLE: ""
@@ -295,23 +295,23 @@ steps:
           slurm_ntasks: 1
           slurm_mem: 20GB
 
-      - label: "AMIP - modular, Float64 test"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/coarse_single_modular_ft64.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/coarse_single_modular_ft64_artifacts/*"
+      - label: "AMIP - Float64 test"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/coarse_single_ft64.yml"
+        artifact_paths: "experiments/AMIP/output/amip/coarse_single_ft64_artifacts/*"
         agents:
           slurm_ntasks: 1
           slurm_mem: 20GB
 
-      - label: "AMIP - modular, Float32 test"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/coarse_single_modular_ft32.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/coarse_single_modular_ft32_artifacts/*"
+      - label: "AMIP - Float32 test"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/coarse_single_ft32.yml"
+        artifact_paths: "experiments/AMIP/output/amip/coarse_single_ft32_artifacts/*"
         agents:
           slurm_ntasks: 1
           slurm_mem: 20GB
 
       - label: "MPI AMIP"
-        command: "srun julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/coarse_mpi_n2.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/coarse_mpi_n2_artifacts/*"
+        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/coarse_mpi_n2.yml"
+        artifact_paths: "experiments/AMIP/output/amip/coarse_mpi_n2_artifacts/*"
         timeout_in_minutes: 240
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
@@ -325,8 +325,8 @@ steps:
       # short high-res performance test
       - label: "Unthreaded AMIP FINE" # also reported by longruns with a flame graph
         key: "unthreaded_amip_fine"
-        command: "julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --config_file $CONFIG_PATH/target_amip_n1_shortrun.yml"
-        artifact_paths: "experiments/AMIP/modular/output/amip/target_amip_n1_shortrun_artifacts/*"
+        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/target_amip_n1_shortrun.yml"
+        artifact_paths: "experiments/AMIP/output/amip/target_amip_n1_shortrun_artifacts/*"
         env:
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -334,15 +334,15 @@ steps:
 
       # PERFORMANCE RUNS: flame graphs + allocation tests
 
-      - label: ":rocket: flame graph and allocation tests: perf_coarse_single_modular_ft64"
-        command: "julia --color=yes --project=perf perf/flame.jl --config_file $PERF_CONFIG_PATH/perf_coarse_single_modular_ft64.yml"
-        artifact_paths: "perf/output/perf_coarse_single_modular_ft64/*"
+      - label: ":rocket: flame graph and allocation tests: perf_coarse_single_ft64"
+        command: "julia --color=yes --project=perf perf/flame.jl --config_file $PERF_CONFIG_PATH/perf_coarse_single_ft64.yml"
+        artifact_paths: "perf/output/perf_coarse_single_ft64/*"
         agents:
           slurm_mem: 20GB
 
-      - label: ":rocket: performance: flame graph diff: perf_diff_coarse_single_modular_ft64"
-        command: "julia --color=yes --project=perf perf/flame_diff.jl --config_file $PERF_CONFIG_PATH/perf_diff_coarse_single_modular_ft64.yml"
-        artifact_paths: "perf/output/perf_diff_coarse_single_modular_ft64/*"
+      - label: ":rocket: performance: flame graph diff: perf_diff_coarse_single_ft64"
+        command: "julia --color=yes --project=perf perf/flame_diff.jl --config_file $PERF_CONFIG_PATH/perf_diff_coarse_single_ft64.yml"
+        artifact_paths: "perf/output/perf_diff_coarse_single_ft64/*"
         agents:
           slurm_mem: 20GB
 
diff --git a/.dev/up_deps.jl b/.dev/up_deps.jl
index 9e874f4e8..a487c303c 100644
--- a/.dev/up_deps.jl
+++ b/.dev/up_deps.jl
@@ -11,7 +11,7 @@ dirs = (
     joinpath(root, ".dev"),
     joinpath(root, "perf"),
     joinpath(root, "docs"),
-    joinpath(root, "experiments/AMIP/modular"),
+    joinpath(root, "experiments/AMIP"),
 )
 
 cd(root) do
diff --git a/config/model_configs/coarse_single_modular_ft32.yml b/config/model_configs/coarse_single_ft32.yml
similarity index 78%
rename from config/model_configs/coarse_single_modular_ft32.yml
rename to config/model_configs/coarse_single_ft32.yml
index 36d365431..271b2047d 100644
--- a/config/model_configs/coarse_single_modular_ft32.yml
+++ b/config/model_configs/coarse_single_ft32.yml
@@ -1,4 +1,4 @@
-run_name: "coarse_single_modular_ft32"
+run_name: "coarse_single_ft32"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -15,4 +15,4 @@ dt_save_restart: "10days"
 precip_model: "0M"
 apply_limiter: false
 FLOAT_TYPE: "Float32"
-job_id: "coarse_single_modular_ft32"
+job_id: "coarse_single_ft32"
diff --git a/config/model_configs/coarse_single_modular_ft64.yml b/config/model_configs/coarse_single_ft64.yml
similarity index 76%
rename from config/model_configs/coarse_single_modular_ft64.yml
rename to config/model_configs/coarse_single_ft64.yml
index c26e88272..b049f9f4c 100644
--- a/config/model_configs/coarse_single_modular_ft64.yml
+++ b/config/model_configs/coarse_single_ft64.yml
@@ -1,4 +1,4 @@
-run_name: "coarse_single_modular_ft64"
+run_name: "coarse_single_ft64"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -14,5 +14,4 @@ h_elem: 6
 dt_save_restart: "10days"
 precip_model: "0M"
 apply_limiter: false
-job_id: "coarse_single_modular_ft64"
-
+job_id: "coarse_single_ft64"
diff --git a/config/model_configs/coarse_single_modular_ft64_hourly_checkpoints.yml b/config/model_configs/coarse_single_ft64_hourly_checkpoints.yml
similarity index 71%
rename from config/model_configs/coarse_single_modular_ft64_hourly_checkpoints.yml
rename to config/model_configs/coarse_single_ft64_hourly_checkpoints.yml
index 05d902c8d..d69a03300 100644
--- a/config/model_configs/coarse_single_modular_ft64_hourly_checkpoints.yml
+++ b/config/model_configs/coarse_single_ft64_hourly_checkpoints.yml
@@ -1,4 +1,4 @@
-run_name: "coarse_single_modular_ft64_hourly_checkpoints"
+run_name: "coarse_single_ft64_hourly_checkpoints"
 hourly_checkpoint: true
 moist: "equil"
 vert_diff: "true"
@@ -15,4 +15,4 @@ h_elem: 6
 dt_save_restart: "10days"
 precip_model: "0M"
 apply_limiter: false
-job_id: "coarse_single_modular_ft64_hourly_checkpoints"
+job_id: "coarse_single_ft64_hourly_checkpoints"
diff --git a/config/model_configs/coarse_single_modular_ft64_hourly_checkpoints_co2.yml b/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml
similarity index 70%
rename from config/model_configs/coarse_single_modular_ft64_hourly_checkpoints_co2.yml
rename to config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml
index cb4e7f7b5..fe6f9eb1a 100644
--- a/config/model_configs/coarse_single_modular_ft64_hourly_checkpoints_co2.yml
+++ b/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml
@@ -1,4 +1,4 @@
-run_name: "coarse_single_modular_ft64_hourly_checkpoints_co2"
+run_name: "coarse_single_ft64_hourly_checkpoints_co2"
 hourly_checkpoint: true
 moist: "equil"
 vert_diff: "true"
@@ -15,4 +15,4 @@ h_elem: 6
 dt_save_restart: "10days"
 precip_model: "0M"
 apply_limiter: false
-job_id: "coarse_single_modular_ft64_hourly_checkpoints_co2"
+job_id: "coarse_single_ft64_hourly_checkpoints_co2"
diff --git a/config/model_configs/default_modular_unthreaded.yml b/config/model_configs/default_unthreaded.yml
similarity index 75%
rename from config/model_configs/default_modular_unthreaded.yml
rename to config/model_configs/default_unthreaded.yml
index e1192d372..c07ad5038 100644
--- a/config/model_configs/default_modular_unthreaded.yml
+++ b/config/model_configs/default_unthreaded.yml
@@ -1,4 +1,4 @@
-run_name: "default_modular_unthreaded"
+run_name: "default_unthreaded"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -13,4 +13,4 @@ h_elem: 4
 precip_model: "0M"
 anim: true
 apply_limiter: false
-job_id: "default_modular_unthreaded"
+job_id: "default_unthreaded"
diff --git a/config/perf_configs/perf_coarse_single_modular_ft64.yml b/config/perf_configs/perf_coarse_single_ft64.yml
similarity index 75%
rename from config/perf_configs/perf_coarse_single_modular_ft64.yml
rename to config/perf_configs/perf_coarse_single_ft64.yml
index 0d9964122..4de0a6265 100644
--- a/config/perf_configs/perf_coarse_single_modular_ft64.yml
+++ b/config/perf_configs/perf_coarse_single_ft64.yml
@@ -1,4 +1,4 @@
-run_name: "perf_coarse_single_modular_ft64"
+run_name: "perf_coarse_single_ft64"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -14,4 +14,4 @@ h_elem: 6
 dt_save_restart: "10days"
 precip_model: "0M"
 apply_limiter: true
-job_id: "perf_coarse_single_modular_ft64"
\ No newline at end of file
+job_id: "perf_coarse_single_ft64"
diff --git a/config/perf_configs/perf_default_modular_unthreaded.yml b/config/perf_configs/perf_default_unthreaded.yml
similarity index 73%
rename from config/perf_configs/perf_default_modular_unthreaded.yml
rename to config/perf_configs/perf_default_unthreaded.yml
index 4d1a3aa40..ad2124b80 100644
--- a/config/perf_configs/perf_default_modular_unthreaded.yml
+++ b/config/perf_configs/perf_default_unthreaded.yml
@@ -1,4 +1,4 @@
-run_name: "perf_default_modular_unthreaded"
+run_name: "perf_default_unthreaded"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -13,4 +13,4 @@ h_elem: 4
 precip_model: "0M"
 anim: true
 apply_limiter: true
-job_id: "perf_default_modular_unthreaded"
+job_id: "perf_default_unthreaded"
diff --git a/config/perf_configs/perf_diff_coarse_single_modular_ft64.yml b/config/perf_configs/perf_diff_coarse_single_ft64.yml
similarity index 72%
rename from config/perf_configs/perf_diff_coarse_single_modular_ft64.yml
rename to config/perf_configs/perf_diff_coarse_single_ft64.yml
index 4ffa21150..d6b95f631 100644
--- a/config/perf_configs/perf_diff_coarse_single_modular_ft64.yml
+++ b/config/perf_configs/perf_diff_coarse_single_ft64.yml
@@ -1,4 +1,4 @@
-run_name: "perf_diff_coarse_single_modular_ft64"
+run_name: "perf_diff_coarse_single_ft64"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -14,4 +14,4 @@ h_elem: 6
 dt_save_restart: "10days"
 precip_model: "0M"
 apply_limiter: true
-job_id: "perf_diff_coarse_single_modular_ft64"
\ No newline at end of file
+job_id: "perf_diff_coarse_single_ft64"
diff --git a/config/perf_configs/perf_diff_default_modular_unthreaded.yml b/config/perf_configs/perf_diff_default_unthreaded.yml
similarity index 70%
rename from config/perf_configs/perf_diff_default_modular_unthreaded.yml
rename to config/perf_configs/perf_diff_default_unthreaded.yml
index 22063e9ff..676ee8dc1 100644
--- a/config/perf_configs/perf_diff_default_modular_unthreaded.yml
+++ b/config/perf_configs/perf_diff_default_unthreaded.yml
@@ -1,4 +1,4 @@
-run_name: "perf_diff_default_modular_unthreaded"
+run_name: "perf_diff_default_unthreaded"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -13,4 +13,4 @@ h_elem: 4
 precip_model: "0M"
 anim: true
 apply_limiter: true
-job_id: "perf_diff_default_modular_unthreaded"
+job_id: "perf_diff_default_unthreaded"
diff --git a/docs/make.jl b/docs/make.jl
index 88c0a9063..c031a4622 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -10,7 +10,7 @@ const OUTPUT_DIR = joinpath(@__DIR__, "src/generated")
 
 # sea breeze tutorial
 TUTORIAL_DIR_SB = joinpath(EXPERIMENTS_DIR, "ClimaCore/sea_breeze/")
-TUTORIAL_DIR_AMIP = joinpath(EXPERIMENTS_DIR, "AMIP/modular/")
+TUTORIAL_DIR_AMIP = joinpath(EXPERIMENTS_DIR, "AMIP/")
 
 # Pkg.activate(TUTORIAL_DIR)
 # Pkg.instantiate()
@@ -19,7 +19,7 @@ TUTORIAL_DIR_AMIP = joinpath(EXPERIMENTS_DIR, "AMIP/modular/")
 
 # execute Literate on all julia files
 tutorial_files_sb = filter(x -> last(x, 3) == ".jl", readdir(TUTORIAL_DIR_SB))
-tutorial_files_amip = filter(x -> last(x, 17) == "driver_modular.jl", readdir(TUTORIAL_DIR_AMIP))
+tutorial_files_amip = filter(x -> last(x, 9) == "driver.jl", readdir(TUTORIAL_DIR_AMIP))
 
 # Literate generates markdown files and stores them in docs/src/generated/sea_breeze
 map(
diff --git a/experiments/AMIP/modular/Artifacts.toml b/experiments/AMIP/Artifacts.toml
similarity index 100%
rename from experiments/AMIP/modular/Artifacts.toml
rename to experiments/AMIP/Artifacts.toml
diff --git a/experiments/AMIP/modular/Manifest.toml b/experiments/AMIP/Manifest.toml
similarity index 99%
rename from experiments/AMIP/modular/Manifest.toml
rename to experiments/AMIP/Manifest.toml
index a8c27dada..92b1a2252 100644
--- a/experiments/AMIP/modular/Manifest.toml
+++ b/experiments/AMIP/Manifest.toml
@@ -281,7 +281,7 @@ version = "0.3.11"
 
 [[deps.ClimaCoupler]]
 deps = ["CLIMAParameters", "ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "ClimaLSM", "Dates", "DocStringExtensions", "Insolation", "JLD2", "NCDatasets", "Plots", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "TempestRemap_jll", "Thermodynamics"]
-path = "../../.."
+path = "../.."
 uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
 version = "0.1.0"
 
diff --git a/experiments/AMIP/modular/Project.toml b/experiments/AMIP/Project.toml
similarity index 100%
rename from experiments/AMIP/modular/Project.toml
rename to experiments/AMIP/Project.toml
diff --git a/experiments/AMIP/modular/README.md b/experiments/AMIP/README.md
similarity index 100%
rename from experiments/AMIP/modular/README.md
rename to experiments/AMIP/README.md
diff --git a/experiments/AMIP/modular/cli_options.jl b/experiments/AMIP/cli_options.jl
similarity index 100%
rename from experiments/AMIP/modular/cli_options.jl
rename to experiments/AMIP/cli_options.jl
diff --git a/experiments/AMIP/modular/components/atmosphere/climaatmos_init.jl b/experiments/AMIP/components/atmosphere/climaatmos_init.jl
similarity index 100%
rename from experiments/AMIP/modular/components/atmosphere/climaatmos_init.jl
rename to experiments/AMIP/components/atmosphere/climaatmos_init.jl
diff --git a/experiments/AMIP/modular/components/land/bucket_init.jl b/experiments/AMIP/components/land/bucket_init.jl
similarity index 100%
rename from experiments/AMIP/modular/components/land/bucket_init.jl
rename to experiments/AMIP/components/land/bucket_init.jl
diff --git a/experiments/AMIP/modular/components/land/bucket_utils.jl b/experiments/AMIP/components/land/bucket_utils.jl
similarity index 100%
rename from experiments/AMIP/modular/components/land/bucket_utils.jl
rename to experiments/AMIP/components/land/bucket_utils.jl
diff --git a/experiments/AMIP/modular/components/ocean/eisenman_seaice.md b/experiments/AMIP/components/ocean/eisenman_seaice.md
similarity index 100%
rename from experiments/AMIP/modular/components/ocean/eisenman_seaice.md
rename to experiments/AMIP/components/ocean/eisenman_seaice.md
diff --git a/experiments/AMIP/modular/components/ocean/eisenman_seaice_init.jl b/experiments/AMIP/components/ocean/eisenman_seaice_init.jl
similarity index 100%
rename from experiments/AMIP/modular/components/ocean/eisenman_seaice_init.jl
rename to experiments/AMIP/components/ocean/eisenman_seaice_init.jl
diff --git a/experiments/AMIP/modular/components/ocean/prescr_seaice_init.jl b/experiments/AMIP/components/ocean/prescr_seaice_init.jl
similarity index 100%
rename from experiments/AMIP/modular/components/ocean/prescr_seaice_init.jl
rename to experiments/AMIP/components/ocean/prescr_seaice_init.jl
diff --git a/experiments/AMIP/modular/components/ocean/slab_ocean_init.jl b/experiments/AMIP/components/ocean/slab_ocean_init.jl
similarity index 100%
rename from experiments/AMIP/modular/components/ocean/slab_ocean_init.jl
rename to experiments/AMIP/components/ocean/slab_ocean_init.jl
diff --git a/experiments/AMIP/modular/components/slab_utils.jl b/experiments/AMIP/components/slab_utils.jl
similarity index 100%
rename from experiments/AMIP/modular/components/slab_utils.jl
rename to experiments/AMIP/components/slab_utils.jl
diff --git a/experiments/AMIP/modular/coupler_driver_modular.jl b/experiments/AMIP/coupler_driver.jl
similarity index 99%
rename from experiments/AMIP/modular/coupler_driver_modular.jl
rename to experiments/AMIP/coupler_driver.jl
index 0b848e6f0..c72ed66ef 100644
--- a/experiments/AMIP/modular/coupler_driver_modular.jl
+++ b/experiments/AMIP/coupler_driver.jl
@@ -171,7 +171,7 @@ evolving_ocean = config_dict["evolving_ocean"]
 if isinteractive()
     COUPLER_OUTPUT_DIR = joinpath("output", joinpath(mode_name, run_name)) # TempestRemap fails if interactive and paths are too long
 else
-    COUPLER_OUTPUT_DIR = joinpath(pkg_dir, "experiments/AMIP/modular/output", joinpath(mode_name, run_name))
+    COUPLER_OUTPUT_DIR = joinpath(pkg_dir, "experiments/AMIP/output", joinpath(mode_name, run_name))
 end
 mkpath(COUPLER_OUTPUT_DIR)
 
diff --git a/experiments/AMIP/modular/mpi/mpi_init.jl b/experiments/AMIP/mpi/mpi_init.jl
similarity index 100%
rename from experiments/AMIP/modular/mpi/mpi_init.jl
rename to experiments/AMIP/mpi/mpi_init.jl
diff --git a/experiments/AMIP/modular/user_io/amip_visualizer.jl b/experiments/AMIP/user_io/amip_visualizer.jl
similarity index 100%
rename from experiments/AMIP/modular/user_io/amip_visualizer.jl
rename to experiments/AMIP/user_io/amip_visualizer.jl
diff --git a/experiments/AMIP/modular/user_io/debug_plots.jl b/experiments/AMIP/user_io/debug_plots.jl
similarity index 100%
rename from experiments/AMIP/modular/user_io/debug_plots.jl
rename to experiments/AMIP/user_io/debug_plots.jl
diff --git a/experiments/AMIP/modular/user_io/ncep_visualizer.jl b/experiments/AMIP/user_io/ncep_visualizer.jl
similarity index 100%
rename from experiments/AMIP/modular/user_io/ncep_visualizer.jl
rename to experiments/AMIP/user_io/ncep_visualizer.jl
diff --git a/experiments/AMIP/modular/user_io/plot_helper.jl b/experiments/AMIP/user_io/plot_helper.jl
similarity index 100%
rename from experiments/AMIP/modular/user_io/plot_helper.jl
rename to experiments/AMIP/user_io/plot_helper.jl
diff --git a/experiments/AMIP/modular/user_io/user_diagnostics.jl b/experiments/AMIP/user_io/user_diagnostics.jl
similarity index 100%
rename from experiments/AMIP/modular/user_io/user_diagnostics.jl
rename to experiments/AMIP/user_io/user_diagnostics.jl
diff --git a/experiments/AMIP/modular/user_io/user_logging.jl b/experiments/AMIP/user_io/user_logging.jl
similarity index 100%
rename from experiments/AMIP/modular/user_io/user_logging.jl
rename to experiments/AMIP/user_io/user_logging.jl
diff --git a/experiments/AMIP/modular/user_io/viz_explorer.jl b/experiments/AMIP/user_io/viz_explorer.jl
similarity index 100%
rename from experiments/AMIP/modular/user_io/viz_explorer.jl
rename to experiments/AMIP/user_io/viz_explorer.jl
diff --git a/perf/flame.jl b/perf/flame.jl
index a4aa1970b..22976ad47 100644
--- a/perf/flame.jl
+++ b/perf/flame.jl
@@ -10,15 +10,15 @@ using YAML
 
 cc_dir = joinpath(dirname(@__DIR__));
 config_dir = joinpath(cc_dir, "config", "model_configs");
-include(joinpath(cc_dir, "experiments", "AMIP", "modular", "cli_options.jl"));
+include(joinpath(cc_dir, "experiments", "AMIP", "cli_options.jl"));
 
 # assuming a common driver for all tested runs
-filename = joinpath(cc_dir, "experiments", "AMIP", "modular", "coupler_driver_modular.jl")
+filename = joinpath(cc_dir, "experiments", "AMIP", "coupler_driver.jl")
 
 # currently tested jobs and their allowed allocation limits
 allocs_limit = Dict()
-allocs_limit["perf_default_modular_unthreaded"] = 8638304
-allocs_limit["perf_coarse_single_modular_ft64"] = 18280800
+allocs_limit["perf_default_unthreaded"] = 8638304
+allocs_limit["perf_coarse_single_ft64"] = 18280800
 allocs_limit["perf_target_amip_n32_shortrun"] = 172134848
 
 # number of time steps used for profiling
@@ -30,7 +30,7 @@ global parsed_args = parse_commandline(argparse_settings())
 # select the configuration file and extract the run-name
 config_file =
     parsed_args["config_file"] =
-        isinteractive() ? "../config/perf_configs/perf_default_modular_unthreaded.yml" : parsed_args["config_file"]
+        isinteractive() ? "../config/perf_configs/perf_default_unthreaded.yml" : parsed_args["config_file"]
 run_name = parsed_args["run_name"] = split(basename(config_file), ".")[1]
 
 # import config setup
diff --git a/perf/flame_diff.jl b/perf/flame_diff.jl
index 66c664d84..65e03f443 100644
--- a/perf/flame_diff.jl
+++ b/perf/flame_diff.jl
@@ -31,10 +31,10 @@ cwd = pwd()
 
 cc_dir = joinpath(dirname(@__DIR__));
 config_dir = joinpath(cc_dir, "config", "model_configs");
-include(joinpath(cc_dir, "experiments", "AMIP", "modular", "cli_options.jl"));
+include(joinpath(cc_dir, "experiments", "AMIP", "cli_options.jl"));
 
 # assuming a common driver for all tested runs
-filename = joinpath(cc_dir, "experiments", "AMIP", "modular", "coupler_driver_modular.jl")
+filename = joinpath(cc_dir, "experiments", "AMIP", "coupler_driver.jl")
 
 # number of time steps used for profiling
 n_samples = 2
@@ -45,7 +45,7 @@ parsed_args = parse_commandline(argparse_settings())
 # select the configuration file and extract the run-name
 config_file =
     parsed_args["config_file"] =
-        isinteractive() ? "../config/perf_configs/perf_default_modular_unthreaded.yml" : parsed_args["config_file"]
+        isinteractive() ? "../config/perf_configs/perf_default_unthreaded.yml" : parsed_args["config_file"]
 run_name = parsed_args["run_name"] = split(basename(config_file), ".")[1]
 
 # import config setup
diff --git a/test/component_model_tests/bucket_tests.jl b/test/component_model_tests/bucket_tests.jl
index bef56b50a..16782e679 100644
--- a/test/component_model_tests/bucket_tests.jl
+++ b/test/component_model_tests/bucket_tests.jl
@@ -3,8 +3,8 @@ import ClimaCoupler
 using ClimaCoupler.TestHelper: create_space
 using ClimaCore: Fields, Spaces
 
-include(pkgdir(ClimaCoupler, "experiments/AMIP/modular/components/land/bucket_init.jl"))
-include(pkgdir(ClimaCoupler, "experiments/AMIP/modular/components/land/bucket_utils.jl"))
+include(pkgdir(ClimaCoupler, "experiments/AMIP/components/land/bucket_init.jl"))
+include(pkgdir(ClimaCoupler, "experiments/AMIP/components/land/bucket_utils.jl"))
 
 for FT in (Float32, Float64)
     @testset "dss_state! BucketSimulation for FT=$FT" begin
diff --git a/test/component_model_tests/climaatmos_tests.jl b/test/component_model_tests/climaatmos_tests.jl
index 9724a2885..2a3cce627 100644
--- a/test/component_model_tests/climaatmos_tests.jl
+++ b/test/component_model_tests/climaatmos_tests.jl
@@ -4,7 +4,7 @@ using ClimaCoupler.Interfacer: AtmosModelSimulation
 using ClimaCoupler.TestHelper: create_space
 using ClimaCore: Fields, Spaces
 
-include(pkgdir(ClimaCoupler, "experiments/AMIP/modular/components/atmosphere/climaatmos_init.jl"))
+include(pkgdir(ClimaCoupler, "experiments/AMIP/components/atmosphere/climaatmos_init.jl"))
 
 for FT in (Float32, Float64)
     @testset "dss_state! ClimaAtmosSimulation for FT=$FT" begin
diff --git a/test/component_model_tests/eisenman_seaice_tests.jl b/test/component_model_tests/eisenman_seaice_tests.jl
index dd2c9e423..5393d9250 100644
--- a/test/component_model_tests/eisenman_seaice_tests.jl
+++ b/test/component_model_tests/eisenman_seaice_tests.jl
@@ -12,7 +12,7 @@ import CLIMAParameters as CP
 import Thermodynamics as TD
 import Thermodynamics.Parameters as TP
 
-include("../../experiments/AMIP/modular/components/ocean/eisenman_seaice_init.jl")
+include("../../experiments/AMIP/components/ocean/eisenman_seaice_init.jl")
 
 
 for FT in (Float32, Float64)
@@ -322,7 +322,7 @@ for FT in (Float32, Float64)
         @test all(parent(Y.h_ice) .< parent(h_ice_0))
     end
 
-    include("../../experiments/AMIP/modular/components/slab_utils.jl")
+    include("../../experiments/AMIP/components/slab_utils.jl")
     @testset "step! update + total energy calculation for FT=$FT" begin
         Δt = Float64(1000)
 
diff --git a/test/component_model_tests/prescr_seaice_tests.jl b/test/component_model_tests/prescr_seaice_tests.jl
index 19dd8a44e..3aed64f6b 100644
--- a/test/component_model_tests/prescr_seaice_tests.jl
+++ b/test/component_model_tests/prescr_seaice_tests.jl
@@ -7,7 +7,7 @@ using ClimaCore: Fields, Spaces
 import CLIMAParameters as CP
 import Thermodynamics.Parameters as TDP
 
-include(pkgdir(ClimaCoupler, "experiments/AMIP/modular/components/ocean/prescr_seaice_init.jl"))
+include(pkgdir(ClimaCoupler, "experiments/AMIP/components/ocean/prescr_seaice_init.jl"))
 
 for FT in (Float32, Float64)
     @testset "test sea-ice energy slab for FT=$FT" begin
diff --git a/test/component_model_tests/slab_ocean_tests.jl b/test/component_model_tests/slab_ocean_tests.jl
index c46fafddd..87c48bc62 100644
--- a/test/component_model_tests/slab_ocean_tests.jl
+++ b/test/component_model_tests/slab_ocean_tests.jl
@@ -7,7 +7,7 @@ using ClimaCore: Fields, Spaces
 import CLIMAParameters as CP
 import Thermodynamics.Parameters as TDP
 
-include(pkgdir(ClimaCoupler, "experiments/AMIP/modular/components/ocean/slab_ocean_init.jl"))
+include(pkgdir(ClimaCoupler, "experiments/AMIP/components/ocean/slab_ocean_init.jl"))
 
 for FT in (Float32, Float64)
     @testset "dss_state! SlabOceanSimulation for FT=$FT" begin
diff --git a/test/debug/debug_amip_plots.jl b/test/debug/debug_amip_plots.jl
index fd8b4540d..bb8ca76f1 100644
--- a/test/debug/debug_amip_plots.jl
+++ b/test/debug/debug_amip_plots.jl
@@ -26,7 +26,7 @@ struct BucketSimulation{C} <: SurfaceModelSimulation
 end
 name(sim::BucketSimulation) = "BucketSimulation"
 
-include("../../experiments/AMIP/modular/user_io/debug_plots.jl")
+include("../../experiments/AMIP/user_io/debug_plots.jl")
 
 get_field(sim::BucketSimulation, ::Val{:surface_field}) = sim.cache.surface_field
 get_field(sim::SurfaceStub, ::Val{:stub_field}) = sim.cache.stub_field
diff --git a/test/mpi_tests/local_checks.sh b/test/mpi_tests/local_checks.sh
index 904ec4eba..25a727f12 100644
--- a/test/mpi_tests/local_checks.sh
+++ b/test/mpi_tests/local_checks.sh
@@ -14,7 +14,7 @@ export CLIMACORE_DISTRIBUTED="MPI"
 export JULIA_HDF5_PATH=""
 
 export RUN_NAME=amip_restart_mpi_test
-export RESTART_DIR=experiments/AMIP/modular/output/amip/${RUN_NAME}_artifacts/
+export RESTART_DIR=experiments/AMIP/output/amip/${RUN_NAME}_artifacts/
 export RESTART_T=200
 
 julia -e 'using Pkg; Pkg.add("MPIPreferences"); using MPIPreferences; use_system_binary()'
@@ -23,9 +23,9 @@ julia --project -e 'using Pkg; Pkg.build("MPI")'
 julia --project -e 'using Pkg; Pkg.build("HDF5")'
 julia --project -e 'using Pkg; Pkg.API.precompile()'
 
-julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'
-julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.precompile()'
-julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.status()'
+julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'
+julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.precompile()'
+julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.status()'
 
 julia --project=artifacts -e 'using Pkg; Pkg.instantiate(;verbose=true)'
 julia --project=artifacts -e 'using Pkg; Pkg.precompile()'
@@ -34,8 +34,8 @@ julia --project=artifacts artifacts/download_artifacts.jl
 
 # run spin up
 # - specify `--hourly_checkpoint true` to save monthly checkpoints of all model prognostic states
-mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --run_name $RUN_NAME --coupled true   --start_date 19790101 --hourly_checkpoint true  --anim true --surface_setup PrescribedSurface --dt_cpl 200 --energy_check false --mode_name amip --mono_surface false --vert_diff true --moist equil --rad clearsky --precip_model 0M --z_elem 35 --dz_bottom 50 --h_elem 12 --kappa_4 3e16 --rayleigh_sponge true --alpha_rayleigh_uh 0 --dt 200secs --t_end 0.1days --job_id $RUN_NAME --dt_save_to_sol 1000days --dt_save_to_disk 10days --apply_limiter false --FLOAT_TYPE Float64
+mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --run_name $RUN_NAME --coupled true   --start_date 19790101 --hourly_checkpoint true  --anim true --surface_setup PrescribedSurface --dt_cpl 200 --energy_check false --mode_name amip --mono_surface false --vert_diff true --moist equil --rad clearsky --precip_model 0M --z_elem 35 --dz_bottom 50 --h_elem 12 --kappa_4 3e16 --rayleigh_sponge true --alpha_rayleigh_uh 0 --dt 200secs --t_end 0.1days --job_id $RUN_NAME --dt_save_to_sol 1000days --dt_save_to_disk 10days --apply_limiter false --FLOAT_TYPE Float64
 
 # init using a restart
 # - specify the directory of the `checkpoint/` folder (i.e.,  `--restart_dir`) and time (in secs; `--restart_t`) of the restart file
-mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --run_name $RUN_NAME --coupled true --restart_dir $RESTART_DIR --restart_t $RESTART_T --start_date 19790102 --anim true --surface_setup PrescribedSurface --dt_cpl 200 --energy_check false --mode_name amip --mono_surface false --vert_diff true --moist equil --rad clearsky --precip_model 0M --z_elem 35 --dz_bottom 50 --h_elem 12 --kappa_4 3e16 --rayleigh_sponge true --alpha_rayleigh_uh 0 --dt 200secs --t_end 0.1days --job_id $RUN_NAME --dt_save_to_sol 1000days --dt_save_to_disk 10days --apply_limiter false --FLOAT_TYPE Float64
+mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --run_name $RUN_NAME --coupled true --restart_dir $RESTART_DIR --restart_t $RESTART_T --start_date 19790102 --anim true --surface_setup PrescribedSurface --dt_cpl 200 --energy_check false --mode_name amip --mono_surface false --vert_diff true --moist equil --rad clearsky --precip_model 0M --z_elem 35 --dz_bottom 50 --h_elem 12 --kappa_4 3e16 --rayleigh_sponge true --alpha_rayleigh_uh 0 --dt 200secs --t_end 0.1days --job_id $RUN_NAME --dt_save_to_sol 1000days --dt_save_to_disk 10days --apply_limiter false --FLOAT_TYPE Float64