Global: move default config/tmpl to mkexp/

CHANGES.rst

@@ -13,7 +13,7 @@ Global
 ---------
 
 * Move ``standard_*`` directories to ``mkexp/*``,
-  rename ``experiments`` to ``types``.
+  rename ``experiments`` to ``types``, move defaults to ``mkexp/``.
   ``standard_*`` is still supported
 
 Templates

mkexp

@@ -67,8 +67,8 @@ def get_exp_template_names(experiment_config_id, config, job_or_namelist):
         get_exp_template_name(config.experiment_kind, job_or_namelist,
                               ExpConfig.typ_lib_path),
         get_exp_template_name(ExpConfig.default_name, job_or_namelist,
-                              ExpConfig.typ_lib_path),
-        get_template_name(job_or_namelist, ExpConfig.typ_lib_path),
+                              ExpConfig.lib_dir),
+        get_template_name(job_or_namelist, ExpConfig.lib_dir),
         # Legacy directory structure
         get_exp_template_name(config.experiment_kind, job_or_namelist),
         get_exp_template_name(ExpConfig.default_name, job_or_namelist),