diff --git a/PRIVATE b/PRIVATE
index 1df86eb3d..535310ae7 160000
--- a/PRIVATE
+++ b/PRIVATE
@@ -1 +1 @@
-Subproject commit 1df86eb3d63923557406999ed5a1b41a27fb1fda
+Subproject commit 535310ae792895d1eca5d45af335cd7e227af145
diff --git a/examples/config/Phase_Thermal.config b/examples/config/Phase_Thermal.config
deleted file mode 100644
index 9c8baafa9..000000000
--- a/examples/config/Phase_Thermal.config
+++ /dev/null
@@ -1,4 +0,0 @@
-thermal_conductivity11    237.0
-specific_heat             910.0
-mass_density              2700.0
-reference_temperature     300.0
diff --git a/examples/config/phase/alpha-Ti.yaml b/examples/config/phase/alpha-Ti.yaml
new file mode 100644
index 000000000..5bd2580a2
--- /dev/null
+++ b/examples/config/phase/alpha-Ti.yaml
@@ -0,0 +1,2 @@
+lattice: hP
+c/a: 1.587
diff --git a/examples/config/phase/bcc.yaml b/examples/config/phase/bcc.yaml
new file mode 100644
index 000000000..bb7ef10df
--- /dev/null
+++ b/examples/config/phase/bcc.yaml
@@ -0,0 +1 @@
+lattice: cI
diff --git a/examples/config/phase/fcc.yaml b/examples/config/phase/fcc.yaml
new file mode 100644
index 000000000..04f02509d
--- /dev/null
+++ b/examples/config/phase/fcc.yaml
@@ -0,0 +1 @@
+lattice: cF
diff --git a/examples/config/phase/mechanical/elastic/Hooke_Al.yaml b/examples/config/phase/mechanical/elastic/Hooke_Al.yaml
index 583ad183d..025f1ca25 100644
--- a/examples/config/phase/mechanical/elastic/Hooke_Al.yaml
+++ b/examples/config/phase/mechanical/elastic/Hooke_Al.yaml
@@ -1,12 +1,8 @@
-Al:
-  lattice: cF
-  mechanical:
-    elastic:
-      type: Hooke
-      references:
-        - J. Vallin et al.,
-          Journal of Applied Physics 35(6), 1825-1826, 1964,
-          10.1063/1.1713749
-      C_11: 107.3e9
-      C_12: 60.8e9
-      C_44: 28.3e9
+type: Hooke
+references:
+  - J. Vallin et al.,
+    Journal of Applied Physics 35(6), 1825-1826, 1964,
+    10.1063/1.1713749
+C_11: 107.3e9
+C_12: 60.8e9
+C_44: 28.3e9
diff --git a/examples/config/phase/mechanical/elastic/Hooke_Au.yaml b/examples/config/phase/mechanical/elastic/Hooke_Au.yaml
index b2d6cde08..9a4da774d 100644
--- a/examples/config/phase/mechanical/elastic/Hooke_Au.yaml
+++ b/examples/config/phase/mechanical/elastic/Hooke_Au.yaml
@@ -1,12 +1,8 @@
-Au:
-  lattice: cF
-  mechanical:
-    elastic:
-      type: Hooke
-      references:
-        - J.P. Hirth and J. Lothe,
-          Theory of Dislocations, 1982,
-          John Wiley & Sons
-      C_11: 186e9
-      C_12: 157e9
-      C_44: 42e9
+type: Hooke
+references:
+  - J.P. Hirth and J. Lothe,
+    Theory of Dislocations, 1982,
+    John Wiley & Sons
+C_11: 186e9
+C_12: 157e9
+C_44: 42e9
diff --git a/examples/config/phase/mechanical/elastic/Hooke_Ni.yaml b/examples/config/phase/mechanical/elastic/Hooke_Ni.yaml
index 0b032c350..c76632cdd 100644
--- a/examples/config/phase/mechanical/elastic/Hooke_Ni.yaml
+++ b/examples/config/phase/mechanical/elastic/Hooke_Ni.yaml
@@ -1,12 +1,8 @@
-Ni:
-  lattice: cF
-  mechanical:
-    elastic:
-      type: Hooke
-      references:
-        - J.P. Hirth and J. Lothe,
-          Theory of Dislocations, 1982,
-          John Wiley & Sons
-      C_11: 246.5e9
-      C_12: 147.3e9
-      C_44: 124.7e9
+type: Hooke
+references:
+  - J.P. Hirth and J. Lothe,
+    Theory of Dislocations, 1982,
+    John Wiley & Sons
+C_11: 246.5e9
+C_12: 147.3e9
+C_44: 124.7e9
diff --git a/examples/config/phase/mechanical/elastic/Hooke_cpTi.yaml b/examples/config/phase/mechanical/elastic/Hooke_cpTi.yaml
index a3ba24d6c..8684614a4 100644
--- a/examples/config/phase/mechanical/elastic/Hooke_cpTi.yaml
+++ b/examples/config/phase/mechanical/elastic/Hooke_cpTi.yaml
@@ -1,15 +1,10 @@
-cpTi:
-  lattice: hP
-  c/a: 1.587
-  mechanical:
-    elastic:
-      type: Hooke
-      references:
-        - L. Wang et al.,
-          Acta Materialia 132, 598-610, 2017,
-          10.1016/j.actamat.2017.05.015
-      C_11: 162.4e9
-      C_33: 181.6e9
-      C_44: 47.2e9
-      C_12: 92e9
-      C_13: 69e9
+type: Hooke
+references:
+  - L. Wang et al.,
+    Acta Materialia 132, 598-610, 2017,
+    10.1016/j.actamat.2017.05.015
+C_11: 162.4e9
+C_33: 181.6e9
+C_44: 47.2e9
+C_12: 92e9
+C_13: 69e9
diff --git a/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml b/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml
index 4fc233ce5..daaab878d 100644
--- a/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml
+++ b/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml
@@ -2,17 +2,13 @@
 # On the mathematical description of the tensile stress-strain curves of polycrystalline face centered cubic metals
 # International Journal of Plasticity, Volume 12, Issue 1, 1996, Pages 35-43
 # DOI: 10.1016/S0749-6419(95)00043-7
-Au:
-  lattice: cF
-  mechanical:
-    plastic:
-      type: phenopowerlaw
-      output: [xi_sl]
-      N_sl: [12]
-      n_sl: 83
-      dot_gamma_0_sl: 0.001
-      h_0_sl_sl: 75e6
-      h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4]
-      a_sl: 1.0
-      xi_0_sl: [26e6]
-      xi_inf_sl: [53e6]
+type: phenopowerlaw
+output: [xi_sl]
+N_sl: [12]
+n_sl: 83
+dot_gamma_0_sl: 0.001
+h_0_sl_sl: 75e6
+h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4]
+a_sl: 1.0
+xi_0_sl: [26e6]
+xi_inf_sl: [53e6]