diff --git a/plugin/modules/lemur b/plugin/modules/lemur
index 852c71b8..bdbdc3bf 160000
--- a/plugin/modules/lemur
+++ b/plugin/modules/lemur
@@ -1 +1 @@
-Subproject commit 852c71b897ff346f6a76796a418b9da4255d04b1
+Subproject commit bdbdc3bf43515daba2578eb0bb49c4e300588a4c
diff --git a/plugin/modules/testez b/plugin/modules/testez
index 442b7192..5acef965 160000
--- a/plugin/modules/testez
+++ b/plugin/modules/testez
@@ -1 +1 @@
-Subproject commit 442b71926d4e9bd9933bbdd87d95679062723dad
+Subproject commit 5acef9659a177d446800e986b60e4613a35eb418
diff --git a/plugin/spec.lua b/plugin/spec.lua
index 02325bdd..57750e93 100644
--- a/plugin/spec.lua
+++ b/plugin/spec.lua
@@ -14,34 +14,6 @@ package.path = package.path .. ";?/init.lua"
 -- If this fails, make sure you've run `lua bin/install-dependencies.lua` first!
 local lemur = require("modules.lemur")
 
---[[
-	Collapses ModuleScripts named 'init' into their parent folders.
-
-	This is the same result as the collapsing mechanism from Rojo.
-]]
-local function collapse(root)
-	local init = root:FindFirstChild("init")
-	if init then
-		init.Name = root.Name
-		init.Parent = root.Parent
-
-		for _, child in ipairs(root:GetChildren()) do
-			child.Parent = init
-		end
-
-		root:Destroy()
-		root = init
-	end
-
-	for _, child in ipairs(root:GetChildren()) do
-		if child:IsA("Folder") then
-			collapse(child)
-		end
-	end
-
-	return root
-end
-
 -- Create a virtual Roblox tree
 local habitat = lemur.Habitat.new()
 
@@ -51,13 +23,11 @@ Root.Name = "Root"
 
 -- Load all of the modules specified above
 for _, module in ipairs(LOAD_MODULES) do
-	local container = lemur.Instance.new("Folder", Root)
+	local container = habitat:loadFromFs(module[1])
 	container.Name = module[2]
-	habitat:loadFromFs(module[1], container)
+	container.Parent = Root
 end
 
-collapse(Root)
-
 -- Load TestEZ and run our tests
 local TestEZ = habitat:require(Root.TestEZ)
 
@@ -66,4 +36,4 @@ local results = TestEZ.TestBootstrap:run(Root.Plugin, TestEZ.Reporters.TextRepor
 -- Did something go wrong?
 if results.failureCount > 0 then
 	os.exit(1)
-end
+end
\ No newline at end of file