diff --git a/command-snapshot.json b/command-snapshot.json
index a10e03cc..e7b25fbf 100644
--- a/command-snapshot.json
+++ b/command-snapshot.json
@@ -36,6 +36,14 @@
     ],
     "plugin": "@salesforce/plugin-deploy-retrieve"
   },
+  {
+    "alias": [],
+    "command": "project:decompose",
+    "flagAliases": [],
+    "flagChars": ["o", "p"],
+    "flags": ["behavior", "dry-run", "flags-dir", "json", "preserve-temp-dir", "target-org"],
+    "plugin": "@salesforce/plugin-deploy-retrieve"
+  },
   {
     "alias": ["force:source:delete"],
     "command": "project:delete:source",
diff --git a/schemas/project-decompose.json b/schemas/project-decompose.json
new file mode 100644
index 00000000..0e6645ec
--- /dev/null
+++ b/schemas/project-decompose.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$ref": "#/definitions/ProjectDecomposeResult",
+  "definitions": {
+    "ProjectDecomposeResult": {
+      "type": "object",
+      "properties": {
+        "sourceBehaviorOptions": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "deletedFiles": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "createdFiles": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "required": ["sourceBehaviorOptions", "deletedFiles", "createdFiles"],
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/schemas/project-delete-source.json b/schemas/project-delete-source.json
index daff80c4..e2fa16ca 100644
--- a/schemas/project-delete-source.json
+++ b/schemas/project-delete-source.json
@@ -444,6 +444,7 @@
     },
     "FileResponseSuccess": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -459,11 +460,11 @@
           "enum": ["Created", "Changed", "Unchanged", "Deleted"]
         }
       },
-      "required": ["fullName", "state", "type"],
-      "additionalProperties": false
+      "required": ["fullName", "state", "type"]
     },
     "FileResponseFailure": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -492,11 +493,11 @@
           "enum": ["Warning", "Error"]
         }
       },
-      "required": ["error", "fullName", "problemType", "state", "type"],
-      "additionalProperties": false
+      "required": ["error", "fullName", "problemType", "state", "type"]
     },
     "MetadataApiDeployStatus": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "id": {
           "type": "string"
@@ -598,7 +599,6 @@
         "status",
         "success"
       ],
-      "additionalProperties": false,
       "description": "Raw response returned from a checkDeployStatus call to the Metadata API"
     },
     "CoverageResultsFileInfo": {
diff --git a/schemas/project-deploy-cancel.json b/schemas/project-deploy-cancel.json
index 3355e767..a0756bda 100644
--- a/schemas/project-deploy-cancel.json
+++ b/schemas/project-deploy-cancel.json
@@ -142,6 +142,7 @@
     },
     "FileResponseSuccess": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -157,11 +158,11 @@
           "enum": ["Created", "Changed", "Unchanged", "Deleted"]
         }
       },
-      "required": ["fullName", "state", "type"],
-      "additionalProperties": false
+      "required": ["fullName", "state", "type"]
     },
     "FileResponseFailure": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -190,8 +191,7 @@
           "enum": ["Warning", "Error"]
         }
       },
-      "required": ["error", "fullName", "problemType", "state", "type"],
-      "additionalProperties": false
+      "required": ["error", "fullName", "problemType", "state", "type"]
     },
     "RequestStatus": {
       "type": "string",
diff --git a/schemas/project-deploy-quick.json b/schemas/project-deploy-quick.json
index 3355e767..a0756bda 100644
--- a/schemas/project-deploy-quick.json
+++ b/schemas/project-deploy-quick.json
@@ -142,6 +142,7 @@
     },
     "FileResponseSuccess": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -157,11 +158,11 @@
           "enum": ["Created", "Changed", "Unchanged", "Deleted"]
         }
       },
-      "required": ["fullName", "state", "type"],
-      "additionalProperties": false
+      "required": ["fullName", "state", "type"]
     },
     "FileResponseFailure": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -190,8 +191,7 @@
           "enum": ["Warning", "Error"]
         }
       },
-      "required": ["error", "fullName", "problemType", "state", "type"],
-      "additionalProperties": false
+      "required": ["error", "fullName", "problemType", "state", "type"]
     },
     "RequestStatus": {
       "type": "string",
diff --git a/schemas/project-deploy-report.json b/schemas/project-deploy-report.json
index 3355e767..a0756bda 100644
--- a/schemas/project-deploy-report.json
+++ b/schemas/project-deploy-report.json
@@ -142,6 +142,7 @@
     },
     "FileResponseSuccess": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -157,11 +158,11 @@
           "enum": ["Created", "Changed", "Unchanged", "Deleted"]
         }
       },
-      "required": ["fullName", "state", "type"],
-      "additionalProperties": false
+      "required": ["fullName", "state", "type"]
     },
     "FileResponseFailure": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -190,8 +191,7 @@
           "enum": ["Warning", "Error"]
         }
       },
-      "required": ["error", "fullName", "problemType", "state", "type"],
-      "additionalProperties": false
+      "required": ["error", "fullName", "problemType", "state", "type"]
     },
     "RequestStatus": {
       "type": "string",
diff --git a/schemas/project-deploy-resume.json b/schemas/project-deploy-resume.json
index 3355e767..a0756bda 100644
--- a/schemas/project-deploy-resume.json
+++ b/schemas/project-deploy-resume.json
@@ -142,6 +142,7 @@
     },
     "FileResponseSuccess": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -157,11 +158,11 @@
           "enum": ["Created", "Changed", "Unchanged", "Deleted"]
         }
       },
-      "required": ["fullName", "state", "type"],
-      "additionalProperties": false
+      "required": ["fullName", "state", "type"]
     },
     "FileResponseFailure": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -190,8 +191,7 @@
           "enum": ["Warning", "Error"]
         }
       },
-      "required": ["error", "fullName", "problemType", "state", "type"],
-      "additionalProperties": false
+      "required": ["error", "fullName", "problemType", "state", "type"]
     },
     "RequestStatus": {
       "type": "string",
diff --git a/schemas/project-deploy-start.json b/schemas/project-deploy-start.json
index 3355e767..a0756bda 100644
--- a/schemas/project-deploy-start.json
+++ b/schemas/project-deploy-start.json
@@ -142,6 +142,7 @@
     },
     "FileResponseSuccess": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -157,11 +158,11 @@
           "enum": ["Created", "Changed", "Unchanged", "Deleted"]
         }
       },
-      "required": ["fullName", "state", "type"],
-      "additionalProperties": false
+      "required": ["fullName", "state", "type"]
     },
     "FileResponseFailure": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -190,8 +191,7 @@
           "enum": ["Warning", "Error"]
         }
       },
-      "required": ["error", "fullName", "problemType", "state", "type"],
-      "additionalProperties": false
+      "required": ["error", "fullName", "problemType", "state", "type"]
     },
     "RequestStatus": {
       "type": "string",
diff --git a/schemas/project-deploy-validate.json b/schemas/project-deploy-validate.json
index 3355e767..a0756bda 100644
--- a/schemas/project-deploy-validate.json
+++ b/schemas/project-deploy-validate.json
@@ -142,6 +142,7 @@
     },
     "FileResponseSuccess": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -157,11 +158,11 @@
           "enum": ["Created", "Changed", "Unchanged", "Deleted"]
         }
       },
-      "required": ["fullName", "state", "type"],
-      "additionalProperties": false
+      "required": ["fullName", "state", "type"]
     },
     "FileResponseFailure": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -190,8 +191,7 @@
           "enum": ["Warning", "Error"]
         }
       },
-      "required": ["error", "fullName", "problemType", "state", "type"],
-      "additionalProperties": false
+      "required": ["error", "fullName", "problemType", "state", "type"]
     },
     "RequestStatus": {
       "type": "string",
diff --git a/schemas/project-retrieve-start.json b/schemas/project-retrieve-start.json
index 465b3a45..7176d623 100644
--- a/schemas/project-retrieve-start.json
+++ b/schemas/project-retrieve-start.json
@@ -72,6 +72,7 @@
     },
     "FileResponseSuccess": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -87,11 +88,11 @@
           "enum": ["Created", "Changed", "Unchanged", "Deleted"]
         }
       },
-      "required": ["fullName", "state", "type"],
-      "additionalProperties": false
+      "required": ["fullName", "state", "type"]
     },
     "FileResponseFailure": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "fullName": {
           "type": "string"
@@ -120,8 +121,7 @@
           "enum": ["Warning", "Error"]
         }
       },
-      "required": ["error", "fullName", "problemType", "state", "type"],
-      "additionalProperties": false
+      "required": ["error", "fullName", "problemType", "state", "type"]
     },
     "FileProperties": {
       "type": "object",