diff --git a/dartwrf/assim_synth_obs.py b/dartwrf/assim_synth_obs.py
index a8653313eadc66d4d93bb4a54355fab4ba0afd59..7cbdfe9016acdef983711e3843cf014783ebb3ed 100755
--- a/dartwrf/assim_synth_obs.py
+++ b/dartwrf/assim_synth_obs.py
@@ -10,8 +10,8 @@ from dartwrf import wrfout_add_geo
 from dartwrf import obsseq
 from dartwrf import dart_nml
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 wrfout_format = 'wrfout_d01_%Y-%m-%d_%H:%M:%S'
 
 
diff --git a/dartwrf/create_obs_upfront.py b/dartwrf/create_obs_upfront.py
index 510261c15e827452c0ff3bf868e4f69a6ec70870..d89b910af40899a6941c607c00f14c7e6f2458ee 100755
--- a/dartwrf/create_obs_upfront.py
+++ b/dartwrf/create_obs_upfront.py
@@ -4,8 +4,8 @@ import time as time_module
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf.utils import copy, print
 import dartwrf.create_obsseq as osq
 from dartwrf import obsseq
diff --git a/dartwrf/create_obsseq.py b/dartwrf/create_obsseq.py
index c5998d1cf7ff799f11814d70b9224e0648771c92..bf3b0490cca43f7bf70ad1563fec24f7519f376f 100755
--- a/dartwrf/create_obsseq.py
+++ b/dartwrf/create_obsseq.py
@@ -7,14 +7,10 @@ import numpy as np
 import datetime as dt
 from pysolar.solar import get_altitude, get_azimuth
 
-from config.cluster import cluster
+from server_config import cluster
 from dartwrf.obs import calculate_obs_locations as col
 from dartwrf import utils
-
-
-#####################
-# Global variables
-from dartwrf.obskind import obs_kind_nrs  # DART internal indices
+from obskind import obs_kind_nrs # dictionary string => DART internal indices
 
 # position on earth for RTTOV ray geometry
 lat0 = 45.
diff --git a/dartwrf/create_wbubble_wrfinput.py b/dartwrf/create_wbubble_wrfinput.py
index f586102f9189f3fca14d07ce056b85628417cc02..5f354ad889da8e7bb806d95ed7d9b36273defd56 100644
--- a/dartwrf/create_wbubble_wrfinput.py
+++ b/dartwrf/create_wbubble_wrfinput.py
@@ -3,8 +3,8 @@ from re import U
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 import netCDF4 as nc
 
 dx_km = 2
diff --git a/dartwrf/dart_nml.py b/dartwrf/dart_nml.py
index 2e4bf7c4dc67ab92217ef625de46e23840da9eb3..15113e4b432cc3f0956a73b802d9fe81e7637cf8 100644
--- a/dartwrf/dart_nml.py
+++ b/dartwrf/dart_nml.py
@@ -1,7 +1,7 @@
 from dartwrf.utils import append_file
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 earth_radius_km = 6370
 
diff --git a/dartwrf/evaluate_obs_space.py b/dartwrf/evaluate_obs_space.py
index 5cabadeb955352a1d128edafad82d0a79b073dd0..5b113dd6f67c6c339bb006eed850aec374b7c86d 100755
--- a/dartwrf/evaluate_obs_space.py
+++ b/dartwrf/evaluate_obs_space.py
@@ -3,8 +3,8 @@ import time as time_module
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf import assim_synth_obs as aso
 
 def get_previous_obsseq_file(time):
diff --git a/dartwrf/evaluate_posterior.py b/dartwrf/evaluate_posterior.py
index 0f977831535348e2db51d7863571f528fb53086a..6b3c9a61c51e2009408a84c0df0d91091d146041 100755
--- a/dartwrf/evaluate_posterior.py
+++ b/dartwrf/evaluate_posterior.py
@@ -3,8 +3,8 @@ import time as time_module
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf import assim_synth_obs as aso
 
 
@@ -24,4 +24,4 @@ if __name__ == "__main__":
                oso_input = cluster.archivedir+'/obs_seq_out' + assim_time.strftime("/%Y-%m-%d_%H:%M_obs_seq.out")
           shutil.copy(oso_input, cluster.dart_rundir+'/obs_seq.out')
 
-     aso.evaluate(assim_time, output_format="%Y-%m-%d_%H:%M_obs_seq.final-eval_posterior_allobs")
\ No newline at end of file
+     aso.evaluate(assim_time, output_format="%Y-%m-%d_%H:%M_obs_seq.final-evaluate")
\ No newline at end of file
diff --git a/dartwrf/evaluate_prior.py b/dartwrf/evaluate_prior.py
index 5340e5c680db1f25eab9b126e184f5fb3624692a..fec5f87219531540a2aea67066222f6a79f04314 100755
--- a/dartwrf/evaluate_prior.py
+++ b/dartwrf/evaluate_prior.py
@@ -3,8 +3,8 @@ import time as time_module
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf.utils import symlink, copy, sed_inplace, append_file, mkdir, try_remove, print, shell
 from dartwrf import assim_synth_obs as aso
 
diff --git a/dartwrf/obs/calculate_obs_locations.py b/dartwrf/obs/calculate_obs_locations.py
index e381133c52aaf72307700b2f946a8a8b2b1aff04..422808fbe900873c0d9cd6249ba5c0121fd0043c 100755
--- a/dartwrf/obs/calculate_obs_locations.py
+++ b/dartwrf/obs/calculate_obs_locations.py
@@ -7,8 +7,8 @@ import numpy as np
 import datetime as dt
 import xarray as xr
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 #####################
 # Global variables
diff --git a/dartwrf/obsseq_2dim.py b/dartwrf/obsseq_2dim.py
index 46bd60539978d729181fbf46645691760aa0ef2a..ec08e03478a95485276058df05167d457813f7c4 100755
--- a/dartwrf/obsseq_2dim.py
+++ b/dartwrf/obsseq_2dim.py
@@ -19,7 +19,7 @@ import time as time_module
 import datetime as dt
 import numpy as np
 
-from config.cluster import cluster
+from server_config import cluster
 from dartwrf import utils
 from dartwrf import assim_synth_obs as aso
 from dartwrf import obsseq
diff --git a/dartwrf/obsseq_to_netcdf.py b/dartwrf/obsseq_to_netcdf.py
index 2b5ba45716f391f5e6bbccd78e096fd411702236..7bdc6700e04150cad944b97e503a8386fac44cd1 100644
--- a/dartwrf/obsseq_to_netcdf.py
+++ b/dartwrf/obsseq_to_netcdf.py
@@ -1,7 +1,7 @@
 import os, sys, glob, warnings
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 import dartwrf.run_obs_diag as rod
 
 def listdir_dirs(path):
diff --git a/dartwrf/prep_IC_prior.py b/dartwrf/prep_IC_prior.py
index cff04dc097096770fa7b4163b96887c691bf3388..9b27d51bc4926dc68a9bd00bea081e625a8a15a0 100755
--- a/dartwrf/prep_IC_prior.py
+++ b/dartwrf/prep_IC_prior.py
@@ -2,8 +2,8 @@ import os, sys, warnings, glob
 import datetime as dt
 import numpy as np
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf.utils import copy, clean_wrfdir, try_remove
 
 """
diff --git a/dartwrf/prepare_namelist.py b/dartwrf/prepare_namelist.py
index d223aa3a6875d0f4743c1d45846968ed5399cbc2..293fc239cf3df994448e8dc2815c88bdf9ea226c 100755
--- a/dartwrf/prepare_namelist.py
+++ b/dartwrf/prepare_namelist.py
@@ -12,8 +12,8 @@ import os, sys, shutil, warnings
 import datetime as dt
 from docopt import docopt
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf.utils import sed_inplace, copy, symlink, mkdir
 
 def run(iens, begin, end, hist_interval=5, radt=5, archive=True,
diff --git a/dartwrf/prepare_wrfrundir.py b/dartwrf/prepare_wrfrundir.py
index 32e8c984f65d376f1f3741e437350afaf90250a9..5fc2c5c7dbd96368dfdc608f4f4a6f1ada4c9156 100755
--- a/dartwrf/prepare_wrfrundir.py
+++ b/dartwrf/prepare_wrfrundir.py
@@ -9,8 +9,8 @@ Returns:
 import os, sys, shutil
 import datetime as dt
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 from utils import symlink, copy, link_contents
 import prepare_namelist
diff --git a/dartwrf/run_obs_diag.py b/dartwrf/run_obs_diag.py
index bd1ef75b30d53ea9671b48c72485d22ba9607e34..49132b0b8ed247372676a13f634f056b4fca5588 100644
--- a/dartwrf/run_obs_diag.py
+++ b/dartwrf/run_obs_diag.py
@@ -1,7 +1,7 @@
 import os, sys, shutil, glob
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 from dartwrf.utils import symlink, copy, sed_inplace, append_file, shell
 
 rundir_program = '/home/fs71386/lkugler/data/run_DART/'
diff --git a/dartwrf/update_IC.py b/dartwrf/update_IC.py
index 60cec760d2be7763cd39ec64fe4eee4d2e0ede56..5e74b466d9988cc169f69f911ca36ecbacb5cf80 100755
--- a/dartwrf/update_IC.py
+++ b/dartwrf/update_IC.py
@@ -2,8 +2,8 @@ import os, sys, warnings
 import datetime as dt
 import netCDF4 as nc
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 def update_initials_in_WRF_rundir(time):
     """Updates wrfrst-files in `/run_WRF/` directory 
diff --git a/dartwrf/wrfinput_add_geo.py b/dartwrf/wrfinput_add_geo.py
index 1a2c2667ec50f9fd6ea13add4d0d7ded7a7309de..c4317bf3ab9b8581e8480f18d575d37a8b214cff 100755
--- a/dartwrf/wrfinput_add_geo.py
+++ b/dartwrf/wrfinput_add_geo.py
@@ -11,8 +11,8 @@ example call:
 import os, sys
 import netCDF4 as nc
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 def run(geo_data_file, wrfinput_file):
     geo_ds = nc.Dataset(geo_data_file, 'r')
diff --git a/dartwrf/wrfout_add_geo.py b/dartwrf/wrfout_add_geo.py
index a13737c161482ebf2d1829a139d14fc702a1d8f2..48a9b961331dd24abef8e66b26abb1edfd5a9fe1 100755
--- a/dartwrf/wrfout_add_geo.py
+++ b/dartwrf/wrfout_add_geo.py
@@ -1,8 +1,8 @@
 import os, sys
 import netCDF4 as nc
 
-from config.cfg import exp
-from config.cluster import cluster
+from exp_config import exp
+from server_config import cluster
 
 fields_old = ["XLAT_M",   "XLONG_M",      "CLAT",
                 "XLONG_U",  "XLONG_V",     "XLAT_U",    "XLAT_V"]