diff --git a/test-projects/multi_partition_game/initial.tree.json b/test-projects/multi_partition_game/initial.tree.json
index c434277d..d1caf8fc 100644
--- a/test-projects/multi_partition_game/initial.tree.json
+++ b/test-projects/multi_partition_game/initial.tree.json
@@ -1,51 +1,6 @@
 {
   "instances": {
-    "daa80612-5a17-4d07-9e4e-baad4d568676": {
-      "Name": "HttpService",
-      "ClassName": "HttpService",
-      "Properties": {
-        "HttpEnabled": {
-          "Type": "Bool",
-          "Value": true
-        }
-      },
-      "Id": "daa80612-5a17-4d07-9e4e-baad4d568676",
-      "Children": [],
-      "Parent": "0c31c54f-ad78-4bd1-9a85-20b16a992147"
-    },
-    "1b9db376-c3b5-406c-8f6d-e2edf7b450ba": {
-      "Name": "Bar",
-      "ClassName": "Folder",
-      "Properties": {},
-      "Id": "1b9db376-c3b5-406c-8f6d-e2edf7b450ba",
-      "Children": [
-        "8fca320f-cf3f-4b9f-b232-171533985e7f"
-      ],
-      "Parent": "cc953b08-acb9-4482-9262-be896caaa995"
-    },
-    "cc953b08-acb9-4482-9262-be896caaa995": {
-      "Name": "ReplicatedStorage",
-      "ClassName": "ReplicatedStorage",
-      "Properties": {},
-      "Id": "cc953b08-acb9-4482-9262-be896caaa995",
-      "Children": [
-        "a09f9a76-75b0-463c-88cf-23098326fa3a",
-        "1b9db376-c3b5-406c-8f6d-e2edf7b450ba"
-      ],
-      "Parent": "0c31c54f-ad78-4bd1-9a85-20b16a992147"
-    },
-    "a09f9a76-75b0-463c-88cf-23098326fa3a": {
-      "Name": "Ack",
-      "ClassName": "Folder",
-      "Properties": {},
-      "Id": "a09f9a76-75b0-463c-88cf-23098326fa3a",
-      "Children": [
-        "005fbb30-ff81-4114-9d0a-9f8344ec9096",
-        "bf13e09c-2405-4537-acdf-5572d58f53bf"
-      ],
-      "Parent": "cc953b08-acb9-4482-9262-be896caaa995"
-    },
-    "005fbb30-ff81-4114-9d0a-9f8344ec9096": {
+    "6a7e0c50-e85d-4abc-863b-48db75038c65": {
       "Name": "foo",
       "ClassName": "StringValue",
       "Properties": {
@@ -54,22 +9,11 @@
           "Value": "Hello world, from a/foo.txt"
         }
       },
-      "Id": "005fbb30-ff81-4114-9d0a-9f8344ec9096",
+      "Id": "6a7e0c50-e85d-4abc-863b-48db75038c65",
       "Children": [],
-      "Parent": "a09f9a76-75b0-463c-88cf-23098326fa3a"
+      "Parent": "a27d1480-d3d6-424b-86e9-faf9cf387ae8"
     },
-    "0c31c54f-ad78-4bd1-9a85-20b16a992147": {
-      "Name": "multi_partition_game",
-      "ClassName": "DataModel",
-      "Properties": {},
-      "Id": "0c31c54f-ad78-4bd1-9a85-20b16a992147",
-      "Children": [
-        "cc953b08-acb9-4482-9262-be896caaa995",
-        "daa80612-5a17-4d07-9e4e-baad4d568676"
-      ],
-      "Parent": null
-    },
-    "bf13e09c-2405-4537-acdf-5572d58f53bf": {
+    "7abdb15d-9899-414a-baf0-7874c56f8b2a": {
       "Name": "main",
       "ClassName": "ModuleScript",
       "Properties": {
@@ -78,11 +22,67 @@
           "Value": "-- hello, from a/main.lua"
         }
       },
-      "Id": "bf13e09c-2405-4537-acdf-5572d58f53bf",
+      "Id": "7abdb15d-9899-414a-baf0-7874c56f8b2a",
       "Children": [],
-      "Parent": "a09f9a76-75b0-463c-88cf-23098326fa3a"
+      "Parent": "a27d1480-d3d6-424b-86e9-faf9cf387ae8"
     },
-    "8fca320f-cf3f-4b9f-b232-171533985e7f": {
+    "f147da62-b6dc-4833-985a-36941e47de82": {
+      "Name": "multi_partition_game",
+      "ClassName": "DataModel",
+      "Properties": {},
+      "Id": "f147da62-b6dc-4833-985a-36941e47de82",
+      "Children": [
+        "7be3f86d-f8ce-4c6b-88cb-03db03a3fd57",
+        "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e"
+      ],
+      "Parent": null
+    },
+    "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e": {
+      "Name": "ReplicatedStorage",
+      "ClassName": "ReplicatedStorage",
+      "Properties": {},
+      "Id": "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e",
+      "Children": [
+        "a27d1480-d3d6-424b-86e9-faf9cf387ae8",
+        "6ce9c44a-0e66-4aaf-97e7-086407aed226"
+      ],
+      "Parent": "f147da62-b6dc-4833-985a-36941e47de82"
+    },
+    "7be3f86d-f8ce-4c6b-88cb-03db03a3fd57": {
+      "Name": "HttpService",
+      "ClassName": "HttpService",
+      "Properties": {
+        "HttpEnabled": {
+          "Type": "Bool",
+          "Value": true
+        }
+      },
+      "Id": "7be3f86d-f8ce-4c6b-88cb-03db03a3fd57",
+      "Children": [],
+      "Parent": "f147da62-b6dc-4833-985a-36941e47de82"
+    },
+    "a27d1480-d3d6-424b-86e9-faf9cf387ae8": {
+      "Name": "Ack",
+      "ClassName": "Folder",
+      "Properties": {},
+      "Id": "a27d1480-d3d6-424b-86e9-faf9cf387ae8",
+      "Children": [
+        "6a7e0c50-e85d-4abc-863b-48db75038c65",
+        "7abdb15d-9899-414a-baf0-7874c56f8b2a"
+      ],
+      "Parent": "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e"
+    },
+    "6ce9c44a-0e66-4aaf-97e7-086407aed226": {
+      "Name": "Bar",
+      "ClassName": "Folder",
+      "Properties": {},
+      "Id": "6ce9c44a-0e66-4aaf-97e7-086407aed226",
+      "Children": [
+        "8e0006d3-9f03-4ed4-9cb6-81abe23a4754"
+      ],
+      "Parent": "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e"
+    },
+    "8e0006d3-9f03-4ed4-9cb6-81abe23a4754": {
       "Name": "something",
       "ClassName": "ModuleScript",
       "Properties": {
@@ -91,10 +91,10 @@
           "Value": "-- b/something.lua"
         }
       },
-      "Id": "8fca320f-cf3f-4b9f-b232-171533985e7f",
+      "Id": "8e0006d3-9f03-4ed4-9cb6-81abe23a4754",
       "Children": [],
-      "Parent": "1b9db376-c3b5-406c-8f6d-e2edf7b450ba"
+      "Parent": "6ce9c44a-0e66-4aaf-97e7-086407aed226"
     }
   },
-  "root_id": "0c31c54f-ad78-4bd1-9a85-20b16a992147"
+  "root_id": "f147da62-b6dc-4833-985a-36941e47de82"
 }
\ No newline at end of file
diff --git a/test-projects/multi_partition_game/with_dir.tree.json b/test-projects/multi_partition_game/with_dir.tree.json
index c652c9b5..dcecf790 100644
--- a/test-projects/multi_partition_game/with_dir.tree.json
+++ b/test-projects/multi_partition_game/with_dir.tree.json
@@ -1,60 +1,6 @@
 {
   "instances": {
-    "daa80612-5a17-4d07-9e4e-baad4d568676": {
-      "Name": "HttpService",
-      "ClassName": "HttpService",
-      "Properties": {
-        "HttpEnabled": {
-          "Type": "Bool",
-          "Value": true
-        }
-      },
-      "Id": "daa80612-5a17-4d07-9e4e-baad4d568676",
-      "Children": [],
-      "Parent": "0c31c54f-ad78-4bd1-9a85-20b16a992147"
-    },
-    "1b9db376-c3b5-406c-8f6d-e2edf7b450ba": {
-      "Name": "Bar",
-      "ClassName": "Folder",
-      "Properties": {},
-      "Id": "1b9db376-c3b5-406c-8f6d-e2edf7b450ba",
-      "Children": [
-        "8fca320f-cf3f-4b9f-b232-171533985e7f"
-      ],
-      "Parent": "cc953b08-acb9-4482-9262-be896caaa995"
-    },
-    "cc953b08-acb9-4482-9262-be896caaa995": {
-      "Name": "ReplicatedStorage",
-      "ClassName": "ReplicatedStorage",
-      "Properties": {},
-      "Id": "cc953b08-acb9-4482-9262-be896caaa995",
-      "Children": [
-        "a09f9a76-75b0-463c-88cf-23098326fa3a",
-        "1b9db376-c3b5-406c-8f6d-e2edf7b450ba"
-      ],
-      "Parent": "0c31c54f-ad78-4bd1-9a85-20b16a992147"
-    },
-    "257fe82d-8711-4c82-a9f7-7a526ca575a4": {
-      "Name": "added",
-      "ClassName": "Folder",
-      "Properties": {},
-      "Id": "257fe82d-8711-4c82-a9f7-7a526ca575a4",
-      "Children": [],
-      "Parent": "a09f9a76-75b0-463c-88cf-23098326fa3a"
-    },
-    "a09f9a76-75b0-463c-88cf-23098326fa3a": {
-      "Name": "Ack",
-      "ClassName": "Folder",
-      "Properties": {},
-      "Id": "a09f9a76-75b0-463c-88cf-23098326fa3a",
-      "Children": [
-        "005fbb30-ff81-4114-9d0a-9f8344ec9096",
-        "bf13e09c-2405-4537-acdf-5572d58f53bf",
-        "257fe82d-8711-4c82-a9f7-7a526ca575a4"
-      ],
-      "Parent": "cc953b08-acb9-4482-9262-be896caaa995"
-    },
-    "005fbb30-ff81-4114-9d0a-9f8344ec9096": {
+    "6a7e0c50-e85d-4abc-863b-48db75038c65": {
       "Name": "foo",
       "ClassName": "StringValue",
       "Properties": {
@@ -63,22 +9,11 @@
           "Value": "Hello world, from a/foo.txt"
         }
       },
-      "Id": "005fbb30-ff81-4114-9d0a-9f8344ec9096",
+      "Id": "6a7e0c50-e85d-4abc-863b-48db75038c65",
       "Children": [],
-      "Parent": "a09f9a76-75b0-463c-88cf-23098326fa3a"
+      "Parent": "a27d1480-d3d6-424b-86e9-faf9cf387ae8"
     },
-    "0c31c54f-ad78-4bd1-9a85-20b16a992147": {
-      "Name": "multi_partition_game",
-      "ClassName": "DataModel",
-      "Properties": {},
-      "Id": "0c31c54f-ad78-4bd1-9a85-20b16a992147",
-      "Children": [
-        "cc953b08-acb9-4482-9262-be896caaa995",
-        "daa80612-5a17-4d07-9e4e-baad4d568676"
-      ],
-      "Parent": null
-    },
-    "bf13e09c-2405-4537-acdf-5572d58f53bf": {
+    "7abdb15d-9899-414a-baf0-7874c56f8b2a": {
       "Name": "main",
       "ClassName": "ModuleScript",
       "Properties": {
@@ -87,11 +22,76 @@
           "Value": "-- hello, from a/main.lua"
         }
       },
-      "Id": "bf13e09c-2405-4537-acdf-5572d58f53bf",
+      "Id": "7abdb15d-9899-414a-baf0-7874c56f8b2a",
       "Children": [],
-      "Parent": "a09f9a76-75b0-463c-88cf-23098326fa3a"
+      "Parent": "a27d1480-d3d6-424b-86e9-faf9cf387ae8"
     },
-    "8fca320f-cf3f-4b9f-b232-171533985e7f": {
+    "f147da62-b6dc-4833-985a-36941e47de82": {
+      "Name": "multi_partition_game",
+      "ClassName": "DataModel",
+      "Properties": {},
+      "Id": "f147da62-b6dc-4833-985a-36941e47de82",
+      "Children": [
+        "7be3f86d-f8ce-4c6b-88cb-03db03a3fd57",
+        "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e"
+      ],
+      "Parent": null
+    },
+    "b3cc71c5-a558-4fce-a795-cd955ba73c38": {
+      "Name": "added",
+      "ClassName": "Folder",
+      "Properties": {},
+      "Id": "b3cc71c5-a558-4fce-a795-cd955ba73c38",
+      "Children": [],
+      "Parent": "a27d1480-d3d6-424b-86e9-faf9cf387ae8"
+    },
+    "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e": {
+      "Name": "ReplicatedStorage",
+      "ClassName": "ReplicatedStorage",
+      "Properties": {},
+      "Id": "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e",
+      "Children": [
+        "a27d1480-d3d6-424b-86e9-faf9cf387ae8",
+        "6ce9c44a-0e66-4aaf-97e7-086407aed226"
+      ],
+      "Parent": "f147da62-b6dc-4833-985a-36941e47de82"
+    },
+    "7be3f86d-f8ce-4c6b-88cb-03db03a3fd57": {
+      "Name": "HttpService",
+      "ClassName": "HttpService",
+      "Properties": {
+        "HttpEnabled": {
+          "Type": "Bool",
+          "Value": true
+        }
+      },
+      "Id": "7be3f86d-f8ce-4c6b-88cb-03db03a3fd57",
+      "Children": [],
+      "Parent": "f147da62-b6dc-4833-985a-36941e47de82"
+    },
+    "a27d1480-d3d6-424b-86e9-faf9cf387ae8": {
+      "Name": "Ack",
+      "ClassName": "Folder",
+      "Properties": {},
+      "Id": "a27d1480-d3d6-424b-86e9-faf9cf387ae8",
+      "Children": [
+        "6a7e0c50-e85d-4abc-863b-48db75038c65",
+        "7abdb15d-9899-414a-baf0-7874c56f8b2a",
+        "b3cc71c5-a558-4fce-a795-cd955ba73c38"
+      ],
+      "Parent": "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e"
+    },
+    "6ce9c44a-0e66-4aaf-97e7-086407aed226": {
+      "Name": "Bar",
+      "ClassName": "Folder",
+      "Properties": {},
+      "Id": "6ce9c44a-0e66-4aaf-97e7-086407aed226",
+      "Children": [
+        "8e0006d3-9f03-4ed4-9cb6-81abe23a4754"
+      ],
+      "Parent": "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e"
+    },
+    "8e0006d3-9f03-4ed4-9cb6-81abe23a4754": {
       "Name": "something",
       "ClassName": "ModuleScript",
       "Properties": {
@@ -100,10 +100,10 @@
           "Value": "-- b/something.lua"
         }
       },
-      "Id": "8fca320f-cf3f-4b9f-b232-171533985e7f",
+      "Id": "8e0006d3-9f03-4ed4-9cb6-81abe23a4754",
       "Children": [],
-      "Parent": "1b9db376-c3b5-406c-8f6d-e2edf7b450ba"
+      "Parent": "6ce9c44a-0e66-4aaf-97e7-086407aed226"
     }
   },
-  "root_id": "0c31c54f-ad78-4bd1-9a85-20b16a992147"
+  "root_id": "f147da62-b6dc-4833-985a-36941e47de82"
 }
\ No newline at end of file
diff --git a/test-projects/multi_partition_game/with_moved_dir.tree.json b/test-projects/multi_partition_game/with_moved_dir.tree.json
index cbf7e8de..9dd9a2a8 100644
--- a/test-projects/multi_partition_game/with_moved_dir.tree.json
+++ b/test-projects/multi_partition_game/with_moved_dir.tree.json
@@ -1,60 +1,6 @@
 {
   "instances": {
-    "daa80612-5a17-4d07-9e4e-baad4d568676": {
-      "Name": "HttpService",
-      "ClassName": "HttpService",
-      "Properties": {
-        "HttpEnabled": {
-          "Type": "Bool",
-          "Value": true
-        }
-      },
-      "Id": "daa80612-5a17-4d07-9e4e-baad4d568676",
-      "Children": [],
-      "Parent": "0c31c54f-ad78-4bd1-9a85-20b16a992147"
-    },
-    "1b9db376-c3b5-406c-8f6d-e2edf7b450ba": {
-      "Name": "Bar",
-      "ClassName": "Folder",
-      "Properties": {},
-      "Id": "1b9db376-c3b5-406c-8f6d-e2edf7b450ba",
-      "Children": [
-        "8fca320f-cf3f-4b9f-b232-171533985e7f",
-        "83693370-350c-4f63-ac66-3bf79681c8b1"
-      ],
-      "Parent": "cc953b08-acb9-4482-9262-be896caaa995"
-    },
-    "cc953b08-acb9-4482-9262-be896caaa995": {
-      "Name": "ReplicatedStorage",
-      "ClassName": "ReplicatedStorage",
-      "Properties": {},
-      "Id": "cc953b08-acb9-4482-9262-be896caaa995",
-      "Children": [
-        "a09f9a76-75b0-463c-88cf-23098326fa3a",
-        "1b9db376-c3b5-406c-8f6d-e2edf7b450ba"
-      ],
-      "Parent": "0c31c54f-ad78-4bd1-9a85-20b16a992147"
-    },
-    "a09f9a76-75b0-463c-88cf-23098326fa3a": {
-      "Name": "Ack",
-      "ClassName": "Folder",
-      "Properties": {},
-      "Id": "a09f9a76-75b0-463c-88cf-23098326fa3a",
-      "Children": [
-        "005fbb30-ff81-4114-9d0a-9f8344ec9096",
-        "bf13e09c-2405-4537-acdf-5572d58f53bf"
-      ],
-      "Parent": "cc953b08-acb9-4482-9262-be896caaa995"
-    },
-    "83693370-350c-4f63-ac66-3bf79681c8b1": {
-      "Name": "added",
-      "ClassName": "Folder",
-      "Properties": {},
-      "Id": "83693370-350c-4f63-ac66-3bf79681c8b1",
-      "Children": [],
-      "Parent": "1b9db376-c3b5-406c-8f6d-e2edf7b450ba"
-    },
-    "005fbb30-ff81-4114-9d0a-9f8344ec9096": {
+    "6a7e0c50-e85d-4abc-863b-48db75038c65": {
       "Name": "foo",
       "ClassName": "StringValue",
       "Properties": {
@@ -63,22 +9,11 @@
           "Value": "Hello world, from a/foo.txt"
         }
       },
-      "Id": "005fbb30-ff81-4114-9d0a-9f8344ec9096",
+      "Id": "6a7e0c50-e85d-4abc-863b-48db75038c65",
       "Children": [],
-      "Parent": "a09f9a76-75b0-463c-88cf-23098326fa3a"
+      "Parent": "a27d1480-d3d6-424b-86e9-faf9cf387ae8"
     },
-    "0c31c54f-ad78-4bd1-9a85-20b16a992147": {
-      "Name": "multi_partition_game",
-      "ClassName": "DataModel",
-      "Properties": {},
-      "Id": "0c31c54f-ad78-4bd1-9a85-20b16a992147",
-      "Children": [
-        "cc953b08-acb9-4482-9262-be896caaa995",
-        "daa80612-5a17-4d07-9e4e-baad4d568676"
-      ],
-      "Parent": null
-    },
-    "bf13e09c-2405-4537-acdf-5572d58f53bf": {
+    "7abdb15d-9899-414a-baf0-7874c56f8b2a": {
       "Name": "main",
       "ClassName": "ModuleScript",
       "Properties": {
@@ -87,11 +22,76 @@
           "Value": "-- hello, from a/main.lua"
         }
       },
-      "Id": "bf13e09c-2405-4537-acdf-5572d58f53bf",
+      "Id": "7abdb15d-9899-414a-baf0-7874c56f8b2a",
       "Children": [],
-      "Parent": "a09f9a76-75b0-463c-88cf-23098326fa3a"
+      "Parent": "a27d1480-d3d6-424b-86e9-faf9cf387ae8"
     },
-    "8fca320f-cf3f-4b9f-b232-171533985e7f": {
+    "f147da62-b6dc-4833-985a-36941e47de82": {
+      "Name": "multi_partition_game",
+      "ClassName": "DataModel",
+      "Properties": {},
+      "Id": "f147da62-b6dc-4833-985a-36941e47de82",
+      "Children": [
+        "7be3f86d-f8ce-4c6b-88cb-03db03a3fd57",
+        "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e"
+      ],
+      "Parent": null
+    },
+    "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e": {
+      "Name": "ReplicatedStorage",
+      "ClassName": "ReplicatedStorage",
+      "Properties": {},
+      "Id": "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e",
+      "Children": [
+        "a27d1480-d3d6-424b-86e9-faf9cf387ae8",
+        "6ce9c44a-0e66-4aaf-97e7-086407aed226"
+      ],
+      "Parent": "f147da62-b6dc-4833-985a-36941e47de82"
+    },
+    "7be3f86d-f8ce-4c6b-88cb-03db03a3fd57": {
+      "Name": "HttpService",
+      "ClassName": "HttpService",
+      "Properties": {
+        "HttpEnabled": {
+          "Type": "Bool",
+          "Value": true
+        }
+      },
+      "Id": "7be3f86d-f8ce-4c6b-88cb-03db03a3fd57",
+      "Children": [],
+      "Parent": "f147da62-b6dc-4833-985a-36941e47de82"
+    },
+    "141f9e9a-8ffb-43df-9532-c438d321b7c7": {
+      "Name": "added",
+      "ClassName": "Folder",
+      "Properties": {},
+      "Id": "141f9e9a-8ffb-43df-9532-c438d321b7c7",
+      "Children": [],
+      "Parent": "6ce9c44a-0e66-4aaf-97e7-086407aed226"
+    },
+    "a27d1480-d3d6-424b-86e9-faf9cf387ae8": {
+      "Name": "Ack",
+      "ClassName": "Folder",
+      "Properties": {},
+      "Id": "a27d1480-d3d6-424b-86e9-faf9cf387ae8",
+      "Children": [
+        "6a7e0c50-e85d-4abc-863b-48db75038c65",
+        "7abdb15d-9899-414a-baf0-7874c56f8b2a"
+      ],
+      "Parent": "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e"
+    },
+    "6ce9c44a-0e66-4aaf-97e7-086407aed226": {
+      "Name": "Bar",
+      "ClassName": "Folder",
+      "Properties": {},
+      "Id": "6ce9c44a-0e66-4aaf-97e7-086407aed226",
+      "Children": [
+        "8e0006d3-9f03-4ed4-9cb6-81abe23a4754",
+        "141f9e9a-8ffb-43df-9532-c438d321b7c7"
+      ],
+      "Parent": "fe1dd5ab-3255-47e3-a2b4-8c7181ab715e"
+    },
+    "8e0006d3-9f03-4ed4-9cb6-81abe23a4754": {
       "Name": "something",
       "ClassName": "ModuleScript",
       "Properties": {
@@ -100,10 +100,10 @@
           "Value": "-- b/something.lua"
         }
       },
-      "Id": "8fca320f-cf3f-4b9f-b232-171533985e7f",
+      "Id": "8e0006d3-9f03-4ed4-9cb6-81abe23a4754",
       "Children": [],
-      "Parent": "1b9db376-c3b5-406c-8f6d-e2edf7b450ba"
+      "Parent": "6ce9c44a-0e66-4aaf-97e7-086407aed226"
     }
   },
-  "root_id": "0c31c54f-ad78-4bd1-9a85-20b16a992147"
+  "root_id": "f147da62-b6dc-4833-985a-36941e47de82"
 }
\ No newline at end of file