diff --git a/wit/deps/spin@3.0.0/world.wit b/wit/deps/spin@3.0.0/world.wit
new file mode 100644
index 0000000000..dcdb50b2eb
--- /dev/null
+++ b/wit/deps/spin@3.0.0/world.wit
@@ -0,0 +1,43 @@
+package fermyon:spin@3.0.0;
+
+/// The full world of a guest targeting an http-trigger
+world http-trigger {
+  include platform;
+  export wasi:http/incoming-handler@0.2.0;
+}
+
+/// Like `http-trigger`, but using WASI 0.2.0-rc-2023-10-18
+world http-trigger-rc20231018 {
+  include platform-rc20231018;
+  export wasi:http/incoming-handler@0.2.0-rc-2023-10-18;
+}
+
+/// The imports needed for a guest to run on a Spin host
+world platform {
+  include wasi:cli/imports@0.2.0;
+  import wasi:http/outgoing-handler@0.2.0;
+  import wasi:config/store@0.2.0-draft;
+  import fermyon:spin/llm@2.0.0;
+  import fermyon:spin/redis@2.0.0;
+  import fermyon:spin/mqtt@2.0.0;
+  import fermyon:spin/postgres@2.0.0;
+  import fermyon:spin/mysql@2.0.0;
+  import fermyon:spin/sqlite@2.0.0;
+  import fermyon:spin/key-value@2.0.0;
+  import fermyon:spin/variables@2.0.0;
+}
+
+/// Like `platform`, but using WASI 0.2.0-rc-2023-10-18
+world platform-rc20231018 {
+  include wasi:cli/reactor@0.2.0-rc-2023-10-18;
+  import wasi:http/outgoing-handler@0.2.0-rc-2023-10-18;
+  import wasi:config/store@0.2.0-draft;
+  import fermyon:spin/llm@2.0.0;
+  import fermyon:spin/redis@2.0.0;
+  import fermyon:spin/mqtt@2.0.0;
+  import fermyon:spin/postgres@2.0.0;
+  import fermyon:spin/mysql@2.0.0;
+  import fermyon:spin/sqlite@2.0.0;
+  import fermyon:spin/key-value@2.0.0;
+  import fermyon:spin/variables@2.0.0;
+}
diff --git a/wit/world.wit b/wit/world.wit
index dcdb50b2eb..9bfa3f0d77 100644
--- a/wit/world.wit
+++ b/wit/world.wit
@@ -1,43 +1 @@
-package fermyon:spin@3.0.0;
-
-/// The full world of a guest targeting an http-trigger
-world http-trigger {
-  include platform;
-  export wasi:http/incoming-handler@0.2.0;
-}
-
-/// Like `http-trigger`, but using WASI 0.2.0-rc-2023-10-18
-world http-trigger-rc20231018 {
-  include platform-rc20231018;
-  export wasi:http/incoming-handler@0.2.0-rc-2023-10-18;
-}
-
-/// The imports needed for a guest to run on a Spin host
-world platform {
-  include wasi:cli/imports@0.2.0;
-  import wasi:http/outgoing-handler@0.2.0;
-  import wasi:config/store@0.2.0-draft;
-  import fermyon:spin/llm@2.0.0;
-  import fermyon:spin/redis@2.0.0;
-  import fermyon:spin/mqtt@2.0.0;
-  import fermyon:spin/postgres@2.0.0;
-  import fermyon:spin/mysql@2.0.0;
-  import fermyon:spin/sqlite@2.0.0;
-  import fermyon:spin/key-value@2.0.0;
-  import fermyon:spin/variables@2.0.0;
-}
-
-/// Like `platform`, but using WASI 0.2.0-rc-2023-10-18
-world platform-rc20231018 {
-  include wasi:cli/reactor@0.2.0-rc-2023-10-18;
-  import wasi:http/outgoing-handler@0.2.0-rc-2023-10-18;
-  import wasi:config/store@0.2.0-draft;
-  import fermyon:spin/llm@2.0.0;
-  import fermyon:spin/redis@2.0.0;
-  import fermyon:spin/mqtt@2.0.0;
-  import fermyon:spin/postgres@2.0.0;
-  import fermyon:spin/mysql@2.0.0;
-  import fermyon:spin/sqlite@2.0.0;
-  import fermyon:spin/key-value@2.0.0;
-  import fermyon:spin/variables@2.0.0;
-}
+package spin:top-level;