diff --git a/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.config b/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.config
deleted file mode 100644
index 3a91035ea..000000000
--- a/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.config
+++ /dev/null
@@ -1,20 +0,0 @@
-[Aluminum_Isotropic]
-# Kuo, J. C., Mikrostrukturmechanik von Bikristallen mit Kippkorngrenzen. Shaker-Verlag 2004. http://edoc.mpg.de/204079
-
-elasticity	hooke
-plasticity	isotropic
-
-(output) flowstress
-(output) strainrate
-
-lattice_structure iso
-
-c11		110.9e9
-c12		58.34e9
-m		3
-tau0		31e6
-gdot0		0.001
-n		20
-h0		75e6
-tausat		63e6
-a		2.25
diff --git a/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.yaml b/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.yaml
new file mode 100644
index 000000000..446efc194
--- /dev/null
+++ b/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.yaml
@@ -0,0 +1,16 @@
+# Kuo, J. C., Mikrostrukturmechanik von Bikristallen mit Kippkorngrenzen. Shaker-Verlag 2004. http://edoc.mpg.de/204079
+Aluminum:
+  elasticity: {C_11: 110.9e9, C_12: 58.34e9, type: hooke}
+  generic:
+    output: [F, P, Fe, Fp, Lp]
+  lattice: iso
+  plasticity:
+    type: isotropic
+    output: [xi]
+    xi_0: 31e6
+    xi_inf: 63e6
+    dot_gamma_0: 0.001
+    n: 20
+    M: 3
+    h_0: 75e6
+    a: 2.25
diff --git a/examples/ConfigFiles/Phase_Isotropic_FreeSurface.config b/examples/ConfigFiles/Phase_Isotropic_FreeSurface.config
deleted file mode 100644
index 9a01c5a35..000000000
--- a/examples/ConfigFiles/Phase_Isotropic_FreeSurface.config
+++ /dev/null
@@ -1,24 +0,0 @@
-[Air]
-
-## Isotropic Material model to simulate free surfaces ##
-## For more information see paper Maiti+Eisenlohr2018, Scripta Materialia, 
-## "Fourier-based spectral method solution to finite strain crystal plasticity with free surfaces"
-
-elasticity              hooke
-plasticity              isotropic
-
-/dilatation/
-
-(output)                flowstress
-(output)                strainrate
-
-lattice_structure       iso
-c11                     10e9
-c12                     0.0
-gdot0                   0.001
-tau0                    0.3e6
-tausat                  0.6e6
-h0                      1e6
-n                       5
-m                       3
-a                       2
diff --git a/examples/ConfigFiles/Phase_Isotropic_FreeSurface.yaml b/examples/ConfigFiles/Phase_Isotropic_FreeSurface.yaml
new file mode 100644
index 000000000..20148c4fb
--- /dev/null
+++ b/examples/ConfigFiles/Phase_Isotropic_FreeSurface.yaml
@@ -0,0 +1,17 @@
+# Maiti and Eisenlohr 2018 Scripta Materialia
+Air:
+  elasticity: {C_11: 10e9, C_12: 0.0, type: hooke}
+  generic:
+    output: [F, P, Fe, Fp, Lp]
+  lattice: iso
+  plasticity:
+    type: isotropic
+    output: [xi]
+    xi_0: 0.3e6
+    xi_inf: 0.6e6
+    dot_gamma_0: 0.001
+    n: 5
+    M: 3
+    h_0: 1e6
+    a: 2
+    dilatation: true