diff --git a/etc/peer/models/Set1-Case1/active-crust/fault-sources/set1-case1/set1-case1.geojson b/etc/peer/models/Set1-Case1/active-crust/fault-sources/features/set1-case1.geojson
similarity index 77%
rename from etc/peer/models/Set1-Case1/active-crust/fault-sources/set1-case1/set1-case1.geojson
rename to etc/peer/models/Set1-Case1/active-crust/fault-sources/features/set1-case1.geojson
index 4bcd4dccec3a3ee5a6e544125ba68562c54079dc..4a5b7edec9252454110d74f6db22ad3e4f2efec7 100644
--- a/etc/peer/models/Set1-Case1/active-crust/fault-sources/set1-case1/set1-case1.geojson
+++ b/etc/peer/models/Set1-Case1/active-crust/fault-sources/features/set1-case1.geojson
@@ -15,12 +15,8 @@
     "lower-depth": 12.0,
     "dip": 90.0,
     "rake": 0.0,
-    "rate-type": "SLIP",
+    "rate-type": "RECURRENCE",
     "length": 25.0,
-    "rate-map": {
-      "peer": {
-        "rate": 0.0028528077
-      }
-    }
+    "mfd-tree": "set1-case1"
   }
 }
diff --git a/etc/peer/models/Set1-Case1/active-crust/fault-sources/mfd-map.json b/etc/peer/models/Set1-Case1/active-crust/fault-sources/mfd-map.json
index 0c326ad304d275d4b9cb5547ca1d7aae3e6d1540..2ed2b79cee51a9d71d37f3e996fafe11146d45db 100644
--- a/etc/peer/models/Set1-Case1/active-crust/fault-sources/mfd-map.json
+++ b/etc/peer/models/Set1-Case1/active-crust/fault-sources/mfd-map.json
@@ -1,11 +1,12 @@
 {
-  "peer-faults": [
+  "set1-case1-mfd": [
     {
       "id": "set1-case1",
       "weight": 1.0,
       "value": {
         "type": "SINGLE",
-        "m": 6.5
+        "m": 6.5,
+        "rate": 0.0028528077
       }
     }
   ]
diff --git a/etc/peer/models/Set1-Case1/active-crust/fault-sources/rate-tree.json b/etc/peer/models/Set1-Case1/active-crust/fault-sources/rate-tree.json
deleted file mode 100644
index 1dbfc071890689c24419b6fe3069edcdae978544..0000000000000000000000000000000000000000
--- a/etc/peer/models/Set1-Case1/active-crust/fault-sources/rate-tree.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "id": "BIRD",
-    "weight": 0.1
-  },
-  {
-    "id": "GEO",
-    "weight": 0.8
-  },
-  {
-    "id": "ZENG",
-    "weight": 0.1
-  }
-]
diff --git a/etc/peer/models/Set1-Case1/active-crust/fault-sources/set1-case1/rupture-set.json b/etc/peer/models/Set1-Case1/active-crust/fault-sources/set1-case1/rupture-set.json
new file mode 100644
index 0000000000000000000000000000000000000000..7be454dd4026e4dcde4634881eef7d94d1a4de0e
--- /dev/null
+++ b/etc/peer/models/Set1-Case1/active-crust/fault-sources/set1-case1/rupture-set.json
@@ -0,0 +1,5 @@
+{
+  "name": "PEER Set1-Case1",
+  "id": 1,
+  "mfd-tree": "set1-case1-mfd"
+}
diff --git a/etc/peer/models/Set1-Case1/active-crust/fault-sources/source-tree.json b/etc/peer/models/Set1-Case1/active-crust/fault-sources/source-tree.json
new file mode 100644
index 0000000000000000000000000000000000000000..5b8e1a3ed895e4dab47be718fef3cd49099f3a16
--- /dev/null
+++ b/etc/peer/models/Set1-Case1/active-crust/fault-sources/source-tree.json
@@ -0,0 +1,6 @@
+[
+  {
+    "id": "set1-case1",
+    "weight": 1.0
+  }
+]
diff --git a/etc/peer/models/Set1-Case1/config.json b/etc/peer/models/Set1-Case1/calc-config.json
similarity index 100%
rename from etc/peer/models/Set1-Case1/config.json
rename to etc/peer/models/Set1-Case1/calc-config.json
diff --git a/etc/peer/models/Set1-Case1/Fault/gmm.xml b/etc/peer/models/Set1-Case1/~Fault/gmm.xml
similarity index 100%
rename from etc/peer/models/Set1-Case1/Fault/gmm.xml
rename to etc/peer/models/Set1-Case1/~Fault/gmm.xml
diff --git a/etc/peer/models/Set1-Case1/Fault/source.xml b/etc/peer/models/Set1-Case1/~Fault/source.xml
similarity index 100%
rename from etc/peer/models/Set1-Case1/Fault/source.xml
rename to etc/peer/models/Set1-Case1/~Fault/source.xml
diff --git a/etc/peer/results/Set1-Case1.csv b/etc/peer/results/Set1-Case1.csv
new file mode 100644
index 0000000000000000000000000000000000000000..f60a849f37e53f5cc8ccd50003e1de983c5c99b3
--- /dev/null
+++ b/etc/peer/results/Set1-Case1.csv
@@ -0,0 +1,8 @@
+name,lon,lat,0.001,0.01,0.05,0.1,0.15,0.2,0.25,0.3,0.35,0.4,0.45,0.5,0.55,0.6,0.7,0.8,0.9,1.0
+PEER S1-Fault-Site1,-122.00000,38.11300,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,0.00000000e+00,0.00000000e+00,0.00000000e+00
+PEER S1-Fault-Site2,-122.11400,38.11300,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00
+PEER S1-Fault-Site3,-122.57000,38.11100,2.84874231e-03,2.84874231e-03,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00
+PEER S1-Fault-Site4,-122.00000,38.00000,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,0.00000000e+00,0.00000000e+00,0.00000000e+00
+PEER S1-Fault-Site5,-122.00000,37.91000,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00
+PEER S1-Fault-Site6,-122.00000,38.22500,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,0.00000000e+00,0.00000000e+00,0.00000000e+00
+PEER S1-Fault-Site7,-121.88600,38.11300,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,2.84874231e-03,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00,0.00000000e+00