diff --git a/src/dusk/script/core/CMakeLists.txt b/src/dusk/script/core/CMakeLists.txt
index de2bcba4..d658800e 100644
--- a/src/dusk/script/core/CMakeLists.txt
+++ b/src/dusk/script/core/CMakeLists.txt
@@ -3,87 +3,21 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-target_sources(${DUSK_LIBRARY_TARGET_NAME}
-  PUBLIC
-    array/scriptarraycopy.c
-    array/scriptarraydeep.c
-    array/scriptarraymodify.c
-    array/scriptarraynew.c
-    array/scriptarraysort.c
-    builtin/array/scriptbarraybasic.c
-    builtin/array/scriptbarrayfunc.c
-    builtin/array/scriptbarraymodify.c
-    builtin/array/scriptbarrayorder.c
-    builtin/array/scriptbarraysearch.c
-    builtin/array/scriptbarrayslice.c
-    builtin/core/scriptbconvert.c
-    builtin/core/scriptbinclude.c
-    builtin/core/scriptbprint.c
-    builtin/core/scriptbpromise.c
-    builtin/core/scriptbtype.c
-    builtin/math/scriptbmathbasic.c
-    builtin/math/scriptbmathrandom.c
-    builtin/math/scriptbmathround.c
-    builtin/math/scriptbmathtrig.c
-    builtin/scriptarg.c
-    builtin/scriptbuiltinregister.c
-    builtin/scriptintrinsic.c
-    builtin/scriptnativesig.c
-    builtin/string/scriptbstringcase.c
-    builtin/string/scriptbstringsearch.c
-    builtin/string/scriptbstringsplit.c
-    builtin/string/scriptbstringtrim.c
-    bytecode/scriptbytecodesize.c
-    bytecode/scriptvarint.c
-    call/scriptcall.c
-    coroutine/scriptcoroutineready.c
-    coroutine/scriptcoroutinespawn.c
-    coroutine/scriptframelocate.c
-    coroutine/scriptscheduler.c
-    coroutine/scriptsetposition.c
-    coroutine/scriptstackcheck.c
-    error/scriptraise.c
-    error/scripttrace.c
-    gc/scriptgccollect.c
-    gc/scriptgcmark.c
-    gc/scriptgcscan.c
-    heap/scriptheapalloc.c
-    heap/scriptheapblock.c
-    heap/scriptheapfree.c
-    heap/scriptheapinit.c
-    heap/scriptheapsweep.c
-    number/scriptnumberbinary.c
-    number/scriptnumberformat.c
-    number/scriptnumberparse.c
-    number/scriptnumberunary.c
-    ops/scriptbinaryop.c
-    ops/scriptindex.c
-    ops/scriptref.c
-    promise/scriptpromiseawait.c
-    promise/scriptpromisecombine.c
-    promise/scriptpromisenew.c
-    promise/scriptpromisesettle.c
-    promise/scripttimer.c
-    runtime/scriptruntimeconfig.c
-    runtime/scriptruntimecreate.c
-    runtime/scriptruntimeexecute.c
-    runtime/scriptruntimeload.c
-    runtime/scriptruntimerun.c
-    scope/scriptscopefind.c
-    scope/scriptscopenew.c
-    scope/scriptscopeset.c
-    scope/scriptvariable.c
-    string/scriptbuf.c
-    string/scriptstringchar.c
-    string/scriptstringconcat.c
-    string/scriptstringnew.c
-    string/scriptstringreject.c
-    string/scriptstringsearch.c
-    struct/scriptstruct.c
-    text/scripttext.c
-    value/scriptalloc.c
-    value/scriptfunction.c
-    value/scriptvaluecompare.c
-    value/scriptvalueformat.c
-    value/scriptvalueprimitive.c
-)
+# Subdirs
+add_subdirectory(array)
+add_subdirectory(builtin)
+add_subdirectory(bytecode)
+add_subdirectory(call)
+add_subdirectory(coroutine)
+add_subdirectory(error)
+add_subdirectory(gc)
+add_subdirectory(heap)
+add_subdirectory(number)
+add_subdirectory(ops)
+add_subdirectory(promise)
+add_subdirectory(runtime)
+add_subdirectory(scope)
+add_subdirectory(string)
+add_subdirectory(struct)
+add_subdirectory(text)
+add_subdirectory(value)
diff --git a/src/dusk/script/core/array/CMakeLists.txt b/src/dusk/script/core/array/CMakeLists.txt
new file mode 100644
index 00000000..bcd4be61
--- /dev/null
+++ b/src/dusk/script/core/array/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptarraycopy.c
+    scriptarraydeep.c
+    scriptarraymodify.c
+    scriptarraynew.c
+    scriptarraysort.c
+)
diff --git a/src/dusk/script/core/builtin/CMakeLists.txt b/src/dusk/script/core/builtin/CMakeLists.txt
new file mode 100644
index 00000000..56f2dd85
--- /dev/null
+++ b/src/dusk/script/core/builtin/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptarg.c
+    scriptbuiltinregister.c
+    scriptintrinsic.c
+    scriptnativesig.c
+)
+
+# Subdirs
+add_subdirectory(array)
+add_subdirectory(core)
+add_subdirectory(math)
+add_subdirectory(string)
diff --git a/src/dusk/script/core/builtin/array/CMakeLists.txt b/src/dusk/script/core/builtin/array/CMakeLists.txt
new file mode 100644
index 00000000..e667a68e
--- /dev/null
+++ b/src/dusk/script/core/builtin/array/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptbarraybasic.c
+    scriptbarrayfunc.c
+    scriptbarraymodify.c
+    scriptbarrayorder.c
+    scriptbarraysearch.c
+    scriptbarrayslice.c
+)
diff --git a/src/dusk/script/core/builtin/core/CMakeLists.txt b/src/dusk/script/core/builtin/core/CMakeLists.txt
new file mode 100644
index 00000000..82fa23bd
--- /dev/null
+++ b/src/dusk/script/core/builtin/core/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptbconvert.c
+    scriptbinclude.c
+    scriptbprint.c
+    scriptbpromise.c
+    scriptbtype.c
+)
diff --git a/src/dusk/script/core/builtin/math/CMakeLists.txt b/src/dusk/script/core/builtin/math/CMakeLists.txt
new file mode 100644
index 00000000..0183181c
--- /dev/null
+++ b/src/dusk/script/core/builtin/math/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptbmathbasic.c
+    scriptbmathrandom.c
+    scriptbmathround.c
+    scriptbmathtrig.c
+)
diff --git a/src/dusk/script/core/builtin/string/CMakeLists.txt b/src/dusk/script/core/builtin/string/CMakeLists.txt
new file mode 100644
index 00000000..7ab47b06
--- /dev/null
+++ b/src/dusk/script/core/builtin/string/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptbstringcase.c
+    scriptbstringsearch.c
+    scriptbstringsplit.c
+    scriptbstringtrim.c
+)
diff --git a/src/dusk/script/core/bytecode/CMakeLists.txt b/src/dusk/script/core/bytecode/CMakeLists.txt
new file mode 100644
index 00000000..4c681f2d
--- /dev/null
+++ b/src/dusk/script/core/bytecode/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptbytecodesize.c
+    scriptvarint.c
+)
diff --git a/src/dusk/script/core/call/CMakeLists.txt b/src/dusk/script/core/call/CMakeLists.txt
new file mode 100644
index 00000000..dcfcfe35
--- /dev/null
+++ b/src/dusk/script/core/call/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptcall.c
+)
diff --git a/src/dusk/script/core/coroutine/CMakeLists.txt b/src/dusk/script/core/coroutine/CMakeLists.txt
new file mode 100644
index 00000000..41eb813b
--- /dev/null
+++ b/src/dusk/script/core/coroutine/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptcoroutineready.c
+    scriptcoroutinespawn.c
+    scriptframelocate.c
+    scriptscheduler.c
+    scriptsetposition.c
+    scriptstackcheck.c
+)
diff --git a/src/dusk/script/core/error/CMakeLists.txt b/src/dusk/script/core/error/CMakeLists.txt
new file mode 100644
index 00000000..ecb712b4
--- /dev/null
+++ b/src/dusk/script/core/error/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptraise.c
+    scripttrace.c
+)
diff --git a/src/dusk/script/core/gc/CMakeLists.txt b/src/dusk/script/core/gc/CMakeLists.txt
new file mode 100644
index 00000000..76531bcd
--- /dev/null
+++ b/src/dusk/script/core/gc/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptgccollect.c
+    scriptgcmark.c
+    scriptgcscan.c
+)
diff --git a/src/dusk/script/core/heap/CMakeLists.txt b/src/dusk/script/core/heap/CMakeLists.txt
new file mode 100644
index 00000000..a8dbeb60
--- /dev/null
+++ b/src/dusk/script/core/heap/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptheapalloc.c
+    scriptheapblock.c
+    scriptheapfree.c
+    scriptheapinit.c
+    scriptheapsweep.c
+)
diff --git a/src/dusk/script/core/number/CMakeLists.txt b/src/dusk/script/core/number/CMakeLists.txt
new file mode 100644
index 00000000..394cf12c
--- /dev/null
+++ b/src/dusk/script/core/number/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptnumberbinary.c
+    scriptnumberformat.c
+    scriptnumberparse.c
+    scriptnumberunary.c
+)
diff --git a/src/dusk/script/core/ops/CMakeLists.txt b/src/dusk/script/core/ops/CMakeLists.txt
new file mode 100644
index 00000000..d5dbee68
--- /dev/null
+++ b/src/dusk/script/core/ops/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptbinaryop.c
+    scriptindex.c
+    scriptref.c
+)
diff --git a/src/dusk/script/core/promise/CMakeLists.txt b/src/dusk/script/core/promise/CMakeLists.txt
new file mode 100644
index 00000000..e4c7ea0a
--- /dev/null
+++ b/src/dusk/script/core/promise/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptpromiseawait.c
+    scriptpromisecombine.c
+    scriptpromisenew.c
+    scriptpromisesettle.c
+    scripttimer.c
+)
diff --git a/src/dusk/script/core/runtime/CMakeLists.txt b/src/dusk/script/core/runtime/CMakeLists.txt
new file mode 100644
index 00000000..5f8813f1
--- /dev/null
+++ b/src/dusk/script/core/runtime/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptruntimeconfig.c
+    scriptruntimecreate.c
+    scriptruntimeexecute.c
+    scriptruntimeload.c
+    scriptruntimerun.c
+)
diff --git a/src/dusk/script/core/scope/CMakeLists.txt b/src/dusk/script/core/scope/CMakeLists.txt
new file mode 100644
index 00000000..bc10a375
--- /dev/null
+++ b/src/dusk/script/core/scope/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptscopefind.c
+    scriptscopenew.c
+    scriptscopeset.c
+    scriptvariable.c
+)
diff --git a/src/dusk/script/core/string/CMakeLists.txt b/src/dusk/script/core/string/CMakeLists.txt
new file mode 100644
index 00000000..6b5ecd07
--- /dev/null
+++ b/src/dusk/script/core/string/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptbuf.c
+    scriptstringchar.c
+    scriptstringconcat.c
+    scriptstringnew.c
+    scriptstringreject.c
+    scriptstringsearch.c
+)
diff --git a/src/dusk/script/core/struct/CMakeLists.txt b/src/dusk/script/core/struct/CMakeLists.txt
new file mode 100644
index 00000000..55116a30
--- /dev/null
+++ b/src/dusk/script/core/struct/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptstruct.c
+)
diff --git a/src/dusk/script/core/text/CMakeLists.txt b/src/dusk/script/core/text/CMakeLists.txt
new file mode 100644
index 00000000..8ef4b1b1
--- /dev/null
+++ b/src/dusk/script/core/text/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scripttext.c
+)
diff --git a/src/dusk/script/core/value/CMakeLists.txt b/src/dusk/script/core/value/CMakeLists.txt
new file mode 100644
index 00000000..83059d47
--- /dev/null
+++ b/src/dusk/script/core/value/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptalloc.c
+    scriptfunction.c
+    scriptvaluecompare.c
+    scriptvalueformat.c
+    scriptvalueprimitive.c
+)
diff --git a/src/dusk/script/vm/CMakeLists.txt b/src/dusk/script/vm/CMakeLists.txt
index 2233ac08..1ef2cc5c 100644
--- a/src/dusk/script/vm/CMakeLists.txt
+++ b/src/dusk/script/vm/CMakeLists.txt
@@ -3,30 +3,7 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-target_sources(${DUSK_LIBRARY_TARGET_NAME}
-  PUBLIC
-    execute/scriptvmchecknull.c
-    execute/scriptvmcode.c
-    execute/scriptvmfunction.c
-    execute/scriptvmincdec.c
-    execute/scriptvmfunctionrun.c
-    execute/scriptvmlocate.c
-    execute/scriptvmevalat.c
-    execute/scriptvmloop.c
-    execute/scriptvmname.c
-    execute/scriptvmtable.c
-    image/scriptvmattach.c
-    image/scriptvmlink.c
-    image/scriptvmload.c
-    image/scriptvmmap.c
-    image/scriptvmreader.c
-    image/scriptvmrun.c
-    image/scriptvmverify.c
-    ops/scriptvmopassign.c
-    ops/scriptvmopcall.c
-    ops/scriptvmopconst.c
-    ops/scriptvmopdata.c
-    ops/scriptvmopjump.c
-    ops/scriptvmopmath.c
-    ops/scriptvmopscope.c
-)
+# Subdirs
+add_subdirectory(execute)
+add_subdirectory(image)
+add_subdirectory(ops)
diff --git a/src/dusk/script/vm/execute/CMakeLists.txt b/src/dusk/script/vm/execute/CMakeLists.txt
new file mode 100644
index 00000000..ee2dfc14
--- /dev/null
+++ b/src/dusk/script/vm/execute/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptvmchecknull.c
+    scriptvmcode.c
+    scriptvmfunction.c
+    scriptvmincdec.c
+    scriptvmfunctionrun.c
+    scriptvmlocate.c
+    scriptvmevalat.c
+    scriptvmloop.c
+    scriptvmname.c
+    scriptvmtable.c
+)
diff --git a/src/dusk/script/vm/image/CMakeLists.txt b/src/dusk/script/vm/image/CMakeLists.txt
new file mode 100644
index 00000000..9d2a0268
--- /dev/null
+++ b/src/dusk/script/vm/image/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptvmattach.c
+    scriptvmlink.c
+    scriptvmload.c
+    scriptvmmap.c
+    scriptvmreader.c
+    scriptvmrun.c
+    scriptvmverify.c
+)
diff --git a/src/dusk/script/vm/ops/CMakeLists.txt b/src/dusk/script/vm/ops/CMakeLists.txt
new file mode 100644
index 00000000..cc136e3d
--- /dev/null
+++ b/src/dusk/script/vm/ops/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (c) 2026 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    scriptvmopassign.c
+    scriptvmopcall.c
+    scriptvmopconst.c
+    scriptvmopdata.c
+    scriptvmopjump.c
+    scriptvmopmath.c
+    scriptvmopscope.c
+)