diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
index 9b479dcbe19c17..2841f25c3f3bdc 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
@@ -221,6 +221,8 @@
     <PlatformManifestFileEntry Include="runtime.iffe.js" IsNative="true" />
     <PlatformManifestFileEntry Include="dotnet.d.ts" IsNative="true" />
     <PlatformManifestFileEntry Include="library-dotnet.js" IsNative="true" />
+    <PlatformManifestFileEntry Include="modularize-dotnet.pre.js" IsNative="true" />
+    <PlatformManifestFileEntry Include="modularize-dotnet.post.js" IsNative="true" />
     <PlatformManifestFileEntry Include="pal_random.js" IsNative="true" />
     <PlatformManifestFileEntry Include="corebindings.c" IsNative="true" />
     <PlatformManifestFileEntry Include="driver.c" IsNative="true" />
diff --git a/src/libraries/Common/src/Interop/Browser/Interop.Runtime.cs b/src/libraries/Common/src/Interop/Browser/Interop.Runtime.cs
index 051b412b1199d5..ac3f3d04affd15 100644
--- a/src/libraries/Common/src/Interop/Browser/Interop.Runtime.cs
+++ b/src/libraries/Common/src/Interop/Browser/Interop.Runtime.cs
@@ -98,7 +98,7 @@ public static void StopProfile()
         {
         }
 
-        // Called by the AOT profiler to save profile data into INTERNAL.aot_profile_data
+        // Called by the AOT profiler to save profile data into Module.INTERNAL.aot_profile_data
         [MethodImplAttribute(MethodImplOptions.NoInlining)]
         public static unsafe void DumpAotProfileData(ref byte buf, int len, string extraArg)
         {
diff --git a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/MarshalTests.cs b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/MarshalTests.cs
index 101ce90eaa272e..8f39ece22e515d 100644
--- a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/MarshalTests.cs
+++ b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/MarshalTests.cs
@@ -283,7 +283,7 @@ public static void BindStaticMethod()
         {
             HelperMarshal._intValue = 0;
             Runtime.InvokeJS(@$"
-                var invoke_int = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
+                var invoke_int = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
                 invoke_int (200);
             ");
 
@@ -295,7 +295,7 @@ public static void BindIntPtrStaticMethod()
         {
             HelperMarshal._intPtrValue = IntPtr.Zero;
             Runtime.InvokeJS(@$"
-                var invoke_int_ptr = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeIntPtr"");
+                var invoke_int_ptr = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeIntPtr"");
                 invoke_int_ptr (42);
             ");
             Assert.Equal(42, (int)HelperMarshal._intPtrValue);
@@ -306,7 +306,7 @@ public static void MarshalIntPtrToJS()
         {
             HelperMarshal._marshaledIntPtrValue = IntPtr.Zero;
             Runtime.InvokeJS(@$"
-                var invokeMarshalIntPtr = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeMarshalIntPtr"");
+                var invokeMarshalIntPtr = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeMarshalIntPtr"");
                 var r = invokeMarshalIntPtr ();
 
                 if (r != 42) throw `Invalid int_ptr value`;
@@ -319,7 +319,7 @@ public static void InvokeStaticMethod()
         {
             HelperMarshal._intValue = 0;
             Runtime.InvokeJS(@$"
-                INTERNAL.call_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"", [ 300 ]);
+                Module.INTERNAL.call_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"", [ 300 ]);
             ");
 
             Assert.Equal(300, HelperMarshal._intValue);
@@ -330,7 +330,7 @@ public static void ResolveMethod()
         {
             HelperMarshal._intValue = 0;
             Runtime.InvokeJS(@$"
-                var invoke_int = INTERNAL.mono_method_resolve (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
+                var invoke_int = Module.INTERNAL.mono_method_resolve (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
                 App.call_test_method (""InvokeInt"", [ invoke_int ]);
             ");
 
@@ -629,7 +629,7 @@ public static void BoundStaticMethodMissingArgs()
 
             HelperMarshal._intValue = 1;
             Runtime.InvokeJS(@$"
-                var invoke_int = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
+                var invoke_int = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
                 invoke_int ();
             ");
             Assert.Equal(0, HelperMarshal._intValue);
@@ -640,7 +640,7 @@ public static void BoundStaticMethodExtraArgs()
         {
             HelperMarshal._intValue = 0;
             Runtime.InvokeJS(@$"
-                var invoke_int = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
+                var invoke_int = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
                 invoke_int (200, 400);
             ");
             Assert.Equal(200, HelperMarshal._intValue);
@@ -654,13 +654,13 @@ public static void BoundStaticMethodArgumentTypeCoercion()
 
             HelperMarshal._intValue = 0;
             Runtime.InvokeJS(@$"
-                var invoke_int = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
+                var invoke_int = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
                 invoke_int (""200"");
             ");
             Assert.Equal(200, HelperMarshal._intValue);
 
             Runtime.InvokeJS(@$"
-                var invoke_int = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
+                var invoke_int = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
                 invoke_int (400.5);
             ");
             Assert.Equal(400, HelperMarshal._intValue);
@@ -671,14 +671,14 @@ public static void BoundStaticMethodUnpleasantArgumentTypeCoercion()
         {
             HelperMarshal._intValue = 100;
             Runtime.InvokeJS(@$"
-                var invoke_int = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
+                var invoke_int = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
                 invoke_int (""hello"");
             ");
             Assert.Equal(0, HelperMarshal._intValue);
 
             // In this case at the very least, the leading "7" is not turned into the number 7
             Runtime.InvokeJS(@$"
-                var invoke_int = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
+                var invoke_int = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeInt"");
                 invoke_int (""7apples"");
             ");
             Assert.Equal(0, HelperMarshal._intValue);
@@ -689,7 +689,7 @@ public static void PassUintArgument()
         {
             HelperMarshal._uintValue = 0;
             Runtime.InvokeJS(@$"
-                var invoke_uint = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeUInt"");
+                var invoke_uint = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeUInt"");
                 invoke_uint (0xFFFFFFFE);
             ");
 
@@ -702,9 +702,9 @@ public static void ReturnUintEnum ()
             HelperMarshal._uintValue = 0;
             HelperMarshal._enumValue = TestEnum.BigValue;
             Runtime.InvokeJS(@$"
-                var get_value = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}GetEnumValue"");
+                var get_value = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}GetEnumValue"");
                 var e = get_value ();
-                var invoke_uint = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeUInt"");
+                var invoke_uint = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}InvokeUInt"");
                 invoke_uint (e);
             ");
             Assert.Equal((uint)TestEnum.BigValue, HelperMarshal._uintValue);
@@ -715,7 +715,7 @@ public static void PassUintEnumByValue ()
         {
             HelperMarshal._enumValue = TestEnum.Zero;
             Runtime.InvokeJS(@$"
-                var set_enum = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}SetEnumValue"", ""j"");
+                var set_enum = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}SetEnumValue"", ""j"");
                 set_enum (0xFFFFFFFE);
             ");
             Assert.Equal(TestEnum.BigValue, HelperMarshal._enumValue);
@@ -728,7 +728,7 @@ public static void PassUintEnumByValueMasqueradingAsInt ()
             // HACK: We're explicitly telling the bindings layer to pass an int here, not an enum
             // Because we know the enum is : uint, this is compatible, so it works.
             Runtime.InvokeJS(@$"
-                var set_enum = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}SetEnumValue"", ""i"");
+                var set_enum = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}SetEnumValue"", ""i"");
                 set_enum (0xFFFFFFFE);
             ");
             Assert.Equal(TestEnum.BigValue, HelperMarshal._enumValue);
@@ -740,7 +740,7 @@ public static void PassUintEnumByNameIsNotImplemented ()
             HelperMarshal._enumValue = TestEnum.Zero;
             var exc = Assert.Throws<JSException>( () => 
                 Runtime.InvokeJS(@$"
-                    var set_enum = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}SetEnumValue"", ""j"");
+                    var set_enum = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}SetEnumValue"", ""j"");
                     set_enum (""BigValue"");
                 ")
             );
@@ -752,7 +752,7 @@ public static void CannotUnboxUint64 ()
         {
             var exc = Assert.Throws<JSException>( () => 
                 Runtime.InvokeJS(@$"
-                    var get_u64 = INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}GetUInt64"", """");
+                    var get_u64 = Module.INTERNAL.mono_bind_static_method (""{HelperMarshal.INTEROP_CLASS}GetUInt64"", """");
                     var u64 = get_u64();
                 ")
             );
@@ -806,7 +806,7 @@ public static void ManuallyInternString()
         {
             HelperMarshal._stringResource = HelperMarshal._stringResource2 = null;
             Runtime.InvokeJS(@"
-                var sym = INTERNAL.mono_intern_string(""interned string 3"");
+                var sym = Module.INTERNAL.mono_intern_string(""interned string 3"");
                 App.call_test_method (""InvokeString"", [ sym ], ""s"");
                 App.call_test_method (""InvokeString2"", [ sym ], ""s"");
             ");
@@ -823,7 +823,7 @@ public static void LargeStringsAreNotAutomaticallyLocatedInInternTable()
                 var s = ""long interned string"";
                 for (var i = 0; i < 1024; i++)
                     s += String(i % 10);
-                var sym = INTERNAL.mono_intern_string(s);
+                var sym = Module.INTERNAL.mono_intern_string(s);
                 App.call_test_method (""InvokeString"", [ sym ], ""S"");
                 App.call_test_method (""InvokeString2"", [ sym ], ""s"");
             ");
@@ -837,7 +837,7 @@ public static void CanInternVeryManyStrings()
             HelperMarshal._stringResource = null;
             Runtime.InvokeJS(@"
                 for (var i = 0; i < 10240; i++)
-                    INTERNAL.mono_intern_string('s' + i);
+                    Module.INTERNAL.mono_intern_string('s' + i);
                 App.call_test_method (""InvokeString"", [ 's5000' ], ""S"");
             ");
             Assert.Equal("s5000", HelperMarshal._stringResource);
@@ -864,8 +864,8 @@ public static void InternedStringReturnValuesWork()
             HelperMarshal._stringResource = HelperMarshal._stringResource2 = null;
             var fqn = "[System.Private.Runtime.InteropServices.JavaScript.Tests]System.Runtime.InteropServices.JavaScript.Tests.HelperMarshal:StoreArgumentAndReturnLiteral";
             Runtime.InvokeJS(
-                $"var a = INTERNAL.mono_bind_static_method('{fqn}')('test');\r\n" +
-                $"var b = INTERNAL.mono_bind_static_method('{fqn}')(a);\r\n" +
+                $"var a = Module.INTERNAL.mono_bind_static_method('{fqn}')('test');\r\n" +
+                $"var b = Module.INTERNAL.mono_bind_static_method('{fqn}')(a);\r\n" +
                 "App.call_test_method ('InvokeString2', [ b ]);"
             );
             Assert.Equal("s: 1 length: 1", HelperMarshal._stringResource);
diff --git a/src/mono/sample/mbr/browser/index.html b/src/mono/sample/mbr/browser/index.html
index 6122370dd9d650..c461acc317c37f 100644
--- a/src/mono/sample/mbr/browser/index.html
+++ b/src/mono/sample/mbr/browser/index.html
@@ -2,37 +2,40 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. -->
 <!-- The .NET Foundation licenses this file to you under the MIT license. -->
 <html>
-  <head>
-    <title>TESTS</title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  </head>
-  <body>
-    <h3 id="header">Wasm Browser Sample</h3>
-    Result from Sample.Test.TestMeaning: <span id="out"></span>
-    <div>
-      Click here (upto 2 times): <button id="update">Update</button>
-    </div>
-    <script type='text/javascript'>
-      var App = {
-        init: function () {
-	  var outElement = document.getElementById("out");
-          document.getElementById("update").addEventListener("click", function () {
-	    INTERNAL.call_static_method("[WasmDelta] Sample.Test:Update", []);
-	    console.log ("applied update");
-	    var ret = INTERNAL.call_static_method("[WasmDelta] Sample.Test:TestMeaning", []);
-	    outElement.innerHTML = ret;
-	  })
-          var ret = INTERNAL.call_static_method("[WasmDelta] Sample.Test:TestMeaning", []);
-	  outElement.innerHTML = ret;
-          console.log ("ready");
-        },
-      };
-    </script>
-    <script type="text/javascript" src="runtime.js"></script>
 
-    <script defer src="dotnet.js"></script>
+<head>
+  <title>TESTS</title>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+</head>
 
+<body>
+  <h3 id="header">Wasm Browser Sample</h3>
+  Result from Sample.Test.TestMeaning: <span id="out"></span>
+  <div>
+    Click here (upto 2 times): <button id="update">Update</button>
+  </div>
+  <script type='text/javascript'>
+    var App = {
+      init: function () {
+        var outElement = document.getElementById("out");
+        document.getElementById("update").addEventListener("click", function () {
+          Module.INTERNAL.call_static_method("[WasmDelta] Sample.Test:Update", []);
+          console.log("applied update");
+          var ret = Module.INTERNAL.call_static_method("[WasmDelta] Sample.Test:TestMeaning", []);
+          outElement.innerHTML = ret;
+        })
+        var ret = Module.INTERNAL.call_static_method("[WasmDelta] Sample.Test:TestMeaning", []);
+        outElement.innerHTML = ret;
+        console.log("ready");
+      },
+    };
+  </script>
+  <script type="text/javascript" src="runtime.js"></script>
 
-  </body>
-</html>
+  <script defer src="dotnet.js"></script>
+
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/mono/sample/mbr/browser/runtime.js b/src/mono/sample/mbr/browser/runtime.js
index 0252041eff5acf..42e3077b034b16 100644
--- a/src/mono/sample/mbr/browser/runtime.js
+++ b/src/mono/sample/mbr/browser/runtime.js
@@ -3,29 +3,30 @@
 
 "use strict";
 var Module = {
+    no_global_exports: true,
     config: null,
 
     preInit: async function () {
-        await MONO.mono_wasm_load_config("./mono-config.json"); // sets MONO.config implicitly
+        await Module.MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.MONO.config implicitly
     },
 
     // Called when the runtime is initialized and wasm is ready
     onRuntimeInitialized: function () {
-        if (!MONO.config || MONO.config.error) {
+        if (!Module.MONO.config || Module.MONO.config.error) {
             console.log("An error occured while loading the config file");
             return;
         }
 
-        MONO.config.loaded_cb = function () {
+        Module.MONO.config.loaded_cb = function () {
             App.init();
         };
-        MONO.config.environment_variables = {
+        Module.MONO.config.environment_variables = {
             "DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
         };
-        MONO.config.fetch_file_cb = function (asset) {
+        Module.MONO.config.fetch_file_cb = function (asset) {
             return fetch(asset, { credentials: 'same-origin' });
         }
 
-        MONO.mono_load_runtime_and_bcl_args(MONO.config);
+        Module.MONO.mono_load_runtime_and_bcl_args(Module.MONO.config);
     },
 };
diff --git a/src/mono/sample/wasm/browser-bench/index.html b/src/mono/sample/wasm/browser-bench/index.html
index 136e400e70c2ae..2c16b33dd2d279 100644
--- a/src/mono/sample/wasm/browser-bench/index.html
+++ b/src/mono/sample/wasm/browser-bench/index.html
@@ -2,64 +2,66 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. -->
 <!-- The .NET Foundation licenses this file to you under the MIT license. -->
 <html>
-  <head>
-    <title>TESTS</title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  </head>
-  <body onload="onLoad()">
-    <h3 id="header">Wasm Browser Sample - Simple Benchmark</h3>
-    Output:<br><br> <span id="out"></span>
-    <script type='text/javascript'>
-      var is_testing = false;
-      var tasks = '';
-      var onLoad = function() {
-        var url = new URL(decodeURI(window.location));
-        let args = url.searchParams.getAll('arg');
-        is_testing = args !== undefined && (args.find(arg => arg == '--testing') !== undefined);
-        tasks = url.searchParams.getAll('task');
-      };
 
-      var test_exit = function(exit_code)
-      {
-        if (!is_testing) {
-          console.log(`test_exit: ${exit_code}`);
-          return;
-        }
-
-        /* Set result in a tests_done element, to be read by xharness */
-        var tests_done_elem = document.createElement("label");
-        tests_done_elem.id = "tests_done";
-        tests_done_elem.innerHTML = exit_code.toString();
-        document.body.appendChild(tests_done_elem);
+<head>
+  <title>TESTS</title>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+</head>
 
-        console.log(`WASM EXIT ${exit_code}`);
-      };
+<body onload="onLoad()">
+  <h3 id="header">Wasm Browser Sample - Simple Benchmark</h3>
+  Output:<br><br> <span id="out"></span>
+  <script type='text/javascript'>
+    var is_testing = false;
+    var tasks = '';
+    var onLoad = function () {
+      var url = new URL(decodeURI(window.location));
+      let args = url.searchParams.getAll('arg');
+      is_testing = args !== undefined && (args.find(arg => arg == '--testing') !== undefined);
+      tasks = url.searchParams.getAll('task');
+    };
 
-      function yieldBench () {
-        let promise = INTERNAL.call_static_method("[Wasm.Browser.Bench.Sample] Sample.Test:RunBenchmark", []);
-        promise.then(ret => {
-          document.getElementById("out").innerHTML += ret;
-          if (ret.length > 0) {
-              document.getElementById("out").innerHTML += "<br>";
-              setTimeout(function () { yieldBench(); }, 0);
-          } else {
-              document.getElementById("out").innerHTML += "<br>Finished";
-          }
-        });
+    var test_exit = function (exit_code) {
+      if (!is_testing) {
+        console.log(`test_exit: ${exit_code}`);
+        return;
       }
 
-      var App = {
-        init: function () {
-          if (tasks != '')
-            INTERNAL.call_static_method("[Wasm.Browser.Bench.Sample] Sample.Test:SetTasks", tasks);
-          yieldBench ();
+      /* Set result in a tests_done element, to be read by xharness */
+      var tests_done_elem = document.createElement("label");
+      tests_done_elem.id = "tests_done";
+      tests_done_elem.innerHTML = exit_code.toString();
+      document.body.appendChild(tests_done_elem);
+
+      console.log(`WASM EXIT ${exit_code}`);
+    };
+
+    function yieldBench() {
+      let promise = Module.INTERNAL.call_static_method("[Wasm.Browser.Bench.Sample] Sample.Test:RunBenchmark", []);
+      promise.then(ret => {
+        document.getElementById("out").innerHTML += ret;
+        if (ret.length > 0) {
+          document.getElementById("out").innerHTML += "<br>";
+          setTimeout(function () { yieldBench(); }, 0);
+        } else {
+          document.getElementById("out").innerHTML += "<br>Finished";
         }
-      };
-    </script>
-    <script type="text/javascript" src="runtime.js"></script>
+      });
+    }
+
+    var App = {
+      init: function () {
+        if (tasks != '')
+          Module.INTERNAL.call_static_method("[Wasm.Browser.Bench.Sample] Sample.Test:SetTasks", tasks);
+        yieldBench();
+      }
+    };
+  </script>
+  <script type="text/javascript" src="runtime.js"></script>
+
+  <script defer src="dotnet.js"></script>
 
-    <script defer src="dotnet.js"></script>
+</body>
 
-  </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/mono/sample/wasm/browser-bench/runtime.js b/src/mono/sample/wasm/browser-bench/runtime.js
index 2d934c659ea135..0fb7223f3001aa 100644
--- a/src/mono/sample/wasm/browser-bench/runtime.js
+++ b/src/mono/sample/wasm/browser-bench/runtime.js
@@ -3,20 +3,21 @@
 
 "use strict";
 var Module = {
+    no_global_exports: true,
     config: null,
 
     preInit: async function () {
-        await MONO.mono_wasm_load_config("./mono-config.json"); // sets MONO.config implicitly
+        await Module.MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.MONO.config implicitly
     },
 
     // Called when the runtime is initialized and wasm is ready
     onRuntimeInitialized: function () {
-        if (!MONO.config || MONO.config.error) {
+        if (!Module.MONO.config || Module.MONO.config.error) {
             console.log("An error occured while loading the config file");
             return;
         }
 
-        MONO.config.loaded_cb = function () {
+        Module.MONO.config.loaded_cb = function () {
             try {
                 App.init();
             } catch (error) {
@@ -24,19 +25,19 @@ var Module = {
                 throw (error);
             }
         };
-        MONO.config.fetch_file_cb = function (asset) {
+        Module.MONO.config.fetch_file_cb = function (asset) {
             return fetch(asset, { credentials: 'same-origin' });
         }
 
-        if (MONO.config.enable_profiler) {
-            MONO.config.aot_profiler_options = {
+        if (Module.MONO.config.enable_profiler) {
+            Module.MONO.config.aot_profiler_options = {
                 write_at: "Sample.Test::StopProfile",
                 send_to: "System.Runtime.InteropServices.JavaScript.Runtime::DumpAotProfileData"
             }
         }
 
         try {
-            MONO.mono_load_runtime_and_bcl_args(MONO.config);
+            Module.MONO.mono_load_runtime_and_bcl_args(Module.MONO.config);
         } catch (error) {
             test_exit(1);
             throw (error);
diff --git a/src/mono/sample/wasm/browser-profile/runtime.js b/src/mono/sample/wasm/browser-profile/runtime.js
index 69b84d002bb8d4..93074e3b3b169c 100644
--- a/src/mono/sample/wasm/browser-profile/runtime.js
+++ b/src/mono/sample/wasm/browser-profile/runtime.js
@@ -3,21 +3,22 @@
 
 "use strict";
 var Module = {
+    no_global_exports: true,
     is_testing: false,
     config: null,
 
     preInit: async function () {
-        await MONO.mono_wasm_load_config("./mono-config.json"); // sets MONO.config implicitly
+        await Module.MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.MONO.config implicitly
     },
 
     // Called when the runtime is initialized and wasm is ready
     onRuntimeInitialized: function () {
-        if (!MONO.config || MONO.config.error) {
+        if (!Module.MONO.config || Module.MONO.config.error) {
             console.log("An error occured while loading the config file");
             return;
         }
 
-        MONO.config.loaded_cb = function () {
+        Module.MONO.config.loaded_cb = function () {
             try {
                 Module.init();
             } catch (error) {
@@ -25,19 +26,19 @@ var Module = {
                 throw (error);
             }
         };
-        MONO.config.fetch_file_cb = function (asset) {
+        Module.MONO.config.fetch_file_cb = function (asset) {
             return fetch(asset, { credentials: 'same-origin' });
         }
 
-        if (MONO.config.enable_profiler) {
-            MONO.config.aot_profiler_options = {
+        if (Module.MONO.config.enable_profiler) {
+            Module.MONO.config.aot_profiler_options = {
                 write_at: "Sample.Test::StopProfile",
                 send_to: "System.Runtime.InteropServices.JavaScript.Runtime::DumpAotProfileData"
             }
         }
 
         try {
-            MONO.mono_load_runtime_and_bcl_args(MONO.config);
+            Module.MONO.mono_load_runtime_and_bcl_args(Module.MONO.config);
         } catch (error) {
             Module.test_exit(1);
             throw (error);
@@ -46,7 +47,7 @@ var Module = {
 
     init: function () {
         console.log("not ready yet")
-        const ret = INTERNAL.call_static_method("[Wasm.BrowserProfile.Sample] Sample.Test:TestMeaning", []);
+        const ret = Module.INTERNAL.call_static_method("[Wasm.BrowserProfile.Sample] Sample.Test:TestMeaning", []);
         document.getElementById("out").innerHTML = ret;
         console.log("ready");
 
@@ -56,8 +57,8 @@ var Module = {
             Module.test_exit(exit_code);
         }
 
-        if (MONO.config.enable_profiler) {
-            INTERNAL.call_static_method("[Wasm.BrowserProfile.Sample] Sample.Test:StopProfile", []);
+        if (Module.MONO.config.enable_profiler) {
+            Module.INTERNAL.call_static_method("[Wasm.BrowserProfile.Sample] Sample.Test:StopProfile", []);
             Module.saveProfile();
         }
     },
@@ -85,7 +86,7 @@ var Module = {
 
     saveProfile: function () {
         const a = document.createElement('a');
-        const blob = new Blob([INTERNAL.aot_profile_data]);
+        const blob = new Blob([Module.INTERNAL.aot_profile_data]);
         a.href = URL.createObjectURL(blob);
         a.download = "data.aotprofile";
         // Append anchor to body.
diff --git a/src/mono/sample/wasm/browser/index.html b/src/mono/sample/wasm/browser/index.html
index cedcae5715afb0..1a516b29d4c35b 100644
--- a/src/mono/sample/wasm/browser/index.html
+++ b/src/mono/sample/wasm/browser/index.html
@@ -36,7 +36,7 @@ <h3 id="header">Wasm Browser Sample</h3>
 
       var App = {
         init: function () {
-          var ret = INTERNAL.call_static_method("[Wasm.Browser.Sample] Sample.Test:TestMeaning", []);
+          var ret = Module.INTERNAL.call_static_method("[Wasm.Browser.Sample] Sample.Test:TestMeaning", []);
           document.getElementById("out").innerHTML = ret;
 
           if (is_testing)
diff --git a/src/mono/sample/wasm/browser/runtime.js b/src/mono/sample/wasm/browser/runtime.js
index 8b14c3637e6b4f..6c00b21e11aa3a 100644
--- a/src/mono/sample/wasm/browser/runtime.js
+++ b/src/mono/sample/wasm/browser/runtime.js
@@ -3,21 +3,21 @@
 
 "use strict";
 var Module = {
-
+    no_global_exports: true,
     config: null,
 
     preInit: async function () {
-        await MONO.mono_wasm_load_config("./mono-config.json"); // sets MONO.config implicitly
+        await Module.MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.MONO.config implicitly
     },
 
     // Called when the runtime is initialized and wasm is ready
     onRuntimeInitialized: function () {
-        if (!MONO.config || MONO.config.error) {
+        if (!Module.MONO.config || Module.MONO.config.error) {
             console.log("No config found");
             return;
         }
 
-        MONO.config.loaded_cb = function () {
+        Module.MONO.config.loaded_cb = function () {
             try {
                 App.init();
             } catch (error) {
@@ -25,12 +25,12 @@ var Module = {
                 throw (error);
             }
         };
-        MONO.config.fetch_file_cb = function (asset) {
+        Module.MONO.config.fetch_file_cb = function (asset) {
             return fetch(asset, { credentials: 'same-origin' });
         }
 
         try {
-            MONO.mono_load_runtime_and_bcl_args(MONO.config);
+            Module.MONO.mono_load_runtime_and_bcl_args(Module.MONO.config);
         } catch (error) {
             test_exit(1);
             throw (error);
diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index 69facc5d7204a3..10709c8151c296 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -221,8 +221,10 @@
 
       <_WasmRuntimePackSrcFile ObjectFile="$(_WasmIntermediateOutputPath)%(FileName).o" />
 
-      <_DotnetJSSrcFile Include="$(_WasmRuntimePackSrcDir)\*.js" Exclude="$(_WasmRuntimePackSrcDir)\*.iffe.js"/>
+      <_DotnetJSSrcFile Include="$(_WasmRuntimePackSrcDir)\*.js" Exclude="$(_WasmRuntimePackSrcDir)\*.iffe.js;$(_WasmRuntimePackSrcDir)\*.pre.js;$(_WasmRuntimePackSrcDir)\*.post.js"/>
+      <_WasmExtraJSFile Include="$(_WasmRuntimePackSrcDir)\*.pre.js" Kind="pre-js" />
       <_WasmExtraJSFile Include="$(_WasmRuntimePackSrcDir)\*.iffe.js" Kind="pre-js" />
+      <_WasmExtraJSFile Include="$(_WasmRuntimePackSrcDir)\*.post.js" Kind="post-js" />
       <_WasmNativeFileForLinking Include="@(NativeFileReference)" />
     </ItemGroup>
 
diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs b/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
index 97acfe9517d4ee..2d5102b9f6edeb 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
@@ -172,31 +172,31 @@ internal class MonoCommands
 
         public MonoCommands(string expression) => this.expression = expression;
 
-        public static MonoCommands GetDebuggerAgentBufferReceived() => new MonoCommands("INTERNAL.mono_wasm_get_dbg_command_info()");
+        public static MonoCommands GetDebuggerAgentBufferReceived() => new MonoCommands("Module.INTERNAL.mono_wasm_get_dbg_command_info()");
 
-        public static MonoCommands IsRuntimeReady() => new MonoCommands("INTERNAL.mono_wasm_runtime_is_ready");
+        public static MonoCommands IsRuntimeReady() => new MonoCommands("Module.INTERNAL.mono_wasm_runtime_is_ready");
 
-        public static MonoCommands GetLoadedFiles() => new MonoCommands("INTERNAL.mono_wasm_get_loaded_files()");
+        public static MonoCommands GetLoadedFiles() => new MonoCommands("Module.INTERNAL.mono_wasm_get_loaded_files()");
 
         public static MonoCommands SendDebuggerAgentCommand(int id, int command_set, int command, string command_parameters)
         {
-            return new MonoCommands($"INTERNAL.mono_wasm_send_dbg_command ({id}, {command_set}, {command},'{command_parameters}')");
+            return new MonoCommands($"Module.INTERNAL.mono_wasm_send_dbg_command ({id}, {command_set}, {command},'{command_parameters}')");
         }
 
         public static MonoCommands SendDebuggerAgentCommandWithParms(int id, int command_set, int command, string command_parameters, int len, int type, string parm)
         {
-            return new MonoCommands($"INTERNAL.mono_wasm_send_dbg_command_with_parms ({id}, {command_set}, {command},'{command_parameters}', {len}, {type}, '{parm}')");
+            return new MonoCommands($"Module.INTERNAL.mono_wasm_send_dbg_command_with_parms ({id}, {command_set}, {command},'{command_parameters}', {len}, {type}, '{parm}')");
         }
 
-        public static MonoCommands CallFunctionOn(JToken args) => new MonoCommands($"INTERNAL.mono_wasm_call_function_on ({args})");
+        public static MonoCommands CallFunctionOn(JToken args) => new MonoCommands($"Module.INTERNAL.mono_wasm_call_function_on ({args})");
 
-        public static MonoCommands GetDetails(int objectId, JToken args = null) => new MonoCommands($"INTERNAL.mono_wasm_get_details ({objectId}, {(args ?? "{ }")})");
+        public static MonoCommands GetDetails(int objectId, JToken args = null) => new MonoCommands($"Module.INTERNAL.mono_wasm_get_details ({objectId}, {(args ?? "{ }")})");
 
-        public static MonoCommands Resume() => new MonoCommands($"INTERNAL.mono_wasm_debugger_resume ()");
+        public static MonoCommands Resume() => new MonoCommands($"Module.INTERNAL.mono_wasm_debugger_resume ()");
 
-        public static MonoCommands DetachDebugger() => new MonoCommands($"INTERNAL.mono_wasm_detach_debugger()");
+        public static MonoCommands DetachDebugger() => new MonoCommands($"Module.INTERNAL.mono_wasm_detach_debugger()");
 
-        public static MonoCommands ReleaseObject(DotnetObjectId objectId) => new MonoCommands($"INTERNAL.mono_wasm_release_object('{objectId}')");
+        public static MonoCommands ReleaseObject(DotnetObjectId objectId) => new MonoCommands($"Module.INTERNAL.mono_wasm_release_object('{objectId}')");
     }
 
     internal enum MonoErrorCodes
diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/BreakpointTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/BreakpointTests.cs
index dd807d0bfaf54e..8b21e64c630192 100644
--- a/src/mono/wasm/debugger/DebuggerTestSuite/BreakpointTests.cs
+++ b/src/mono/wasm/debugger/DebuggerTestSuite/BreakpointTests.cs
@@ -36,7 +36,7 @@ public async Task CreateJSBreakpoint()
         {
             // Test that js breakpoints get set correctly
             // 13 24
-            // 13 33
+            // 13 40
             var bp1_res = await SetBreakpoint("/debugger-driver.html", 13, 24);
 
             Assert.EndsWith("debugger-driver.html", bp1_res.Value["breakpointId"].ToString());
@@ -48,7 +48,7 @@ public async Task CreateJSBreakpoint()
             Assert.Equal(13, loc["lineNumber"]);
             Assert.Equal(24, loc["columnNumber"]);
 
-            var bp2_res = await SetBreakpoint("/debugger-driver.html", 13, 33);
+            var bp2_res = await SetBreakpoint("/debugger-driver.html", 13, 40);
 
             Assert.EndsWith("debugger-driver.html", bp2_res.Value["breakpointId"].ToString());
             Assert.Equal(1, bp2_res.Value["locations"]?.Value<JArray>()?.Count);
@@ -57,14 +57,14 @@ public async Task CreateJSBreakpoint()
 
             Assert.NotNull(loc2["scriptId"]);
             Assert.Equal(13, loc2["lineNumber"]);
-            Assert.Equal(33, loc2["columnNumber"]);
+            Assert.Equal(40, loc2["columnNumber"]);
         }
 
         [Fact]
         public async Task CreateJS0Breakpoint()
         {
             // 13 24
-            // 13 33
+            // 13 40
             var bp1_res = await SetBreakpoint("/debugger-driver.html", 13, 0);
 
             Assert.EndsWith("debugger-driver.html", bp1_res.Value["breakpointId"].ToString());
@@ -76,7 +76,7 @@ public async Task CreateJS0Breakpoint()
             Assert.Equal(13, loc["lineNumber"]);
             Assert.Equal(24, loc["columnNumber"]);
 
-            var bp2_res = await SetBreakpoint("/debugger-driver.html", 13, 33);
+            var bp2_res = await SetBreakpoint("/debugger-driver.html", 13, 40);
 
             Assert.EndsWith("debugger-driver.html", bp2_res.Value["breakpointId"].ToString());
             Assert.Equal(1, bp2_res.Value["locations"]?.Value<JArray>()?.Count);
@@ -85,7 +85,7 @@ public async Task CreateJS0Breakpoint()
 
             Assert.NotNull(loc2["scriptId"]);
             Assert.Equal(13, loc2["lineNumber"]);
-            Assert.Equal(33, loc2["columnNumber"]);
+            Assert.Equal(40, loc2["columnNumber"]);
         }
 
         [Theory]
diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/MonoJsTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/MonoJsTests.cs
index 38742d8d363304..7d9a2fe7f35a4d 100644
--- a/src/mono/wasm/debugger/DebuggerTestSuite/MonoJsTests.cs
+++ b/src/mono/wasm/debugger/DebuggerTestSuite/MonoJsTests.cs
@@ -18,12 +18,12 @@ public async Task BadRaiseDebugEventsTest()
         {
             var bad_expressions = new[]
             {
-                    "INTERNAL.mono_wasm_raise_debug_event('')",
-                    "INTERNAL.mono_wasm_raise_debug_event(undefined)",
-                    "INTERNAL.mono_wasm_raise_debug_event({})",
+                    "Module.INTERNAL.mono_wasm_raise_debug_event('')",
+                    "Module.INTERNAL.mono_wasm_raise_debug_event(undefined)",
+                    "Module.INTERNAL.mono_wasm_raise_debug_event({})",
 
-                    "INTERNAL.mono_wasm_raise_debug_event({eventName:'foo'}, '')",
-                    "INTERNAL.mono_wasm_raise_debug_event({eventName:'foo'}, 12)"
+                    "Module.INTERNAL.mono_wasm_raise_debug_event({eventName:'foo'}, '')",
+                    "Module.INTERNAL.mono_wasm_raise_debug_event({eventName:'foo'}, 12)"
                 };
 
             foreach (var expression in bad_expressions)
@@ -58,7 +58,7 @@ public async Task RaiseDebugEventTraceTest(bool? trace)
             });
 
             var trace_str = trace.HasValue ? $"trace: {trace.ToString().ToLower()}" : String.Empty;
-            var expression = $"INTERNAL.mono_wasm_raise_debug_event({{ eventName:'qwe' }}, {{ {trace_str} }})";
+            var expression = $"Module.INTERNAL.mono_wasm_raise_debug_event({{ eventName:'qwe' }}, {{ {trace_str} }})";
             var res = await cli.SendCommand($"Runtime.evaluate", JObject.FromObject(new { expression }), token);
             Assert.True(res.IsOk, $"Expected to pass for {expression}");
 
@@ -139,7 +139,7 @@ async Task AssemblyLoadedEventTest(string asm_name, string asm_path, string pdb_
                 pdb_base64 = Convert.ToBase64String(bytes);
             }
 
-            var expression = $@"INTERNAL.mono_wasm_raise_debug_event({{
+            var expression = $@"Module.INTERNAL.mono_wasm_raise_debug_event({{
                     eventName: 'AssemblyLoaded',
                     assembly_name: '{asm_name}',
                     assembly_b64: '{asm_base64}',
diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
index 07b06b95fe9e85..6adf90e2790cd3 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
+++ b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
@@ -6,14 +6,14 @@
 	<script type='text/javascript'>
 		var App = {
 			init: function () {
-				this.int_add = INTERNAL.mono_bind_static_method ("[debugger-test] Math:IntAdd");
-				this.use_complex = INTERNAL.mono_bind_static_method ("[debugger-test] Math:UseComplex");
-				this.delegates_test = INTERNAL.mono_bind_static_method ("[debugger-test] Math:DelegatesTest");
-				this.generic_types_test = INTERNAL.mono_bind_static_method ("[debugger-test] Math:GenericTypesTest");
-				this.outer_method = INTERNAL.mono_bind_static_method ("[debugger-test] Math:OuterMethod");
-				this.async_method = INTERNAL.mono_bind_static_method ("[debugger-test] Math/NestedInMath:AsyncTest");
-				this.method_with_structs = INTERNAL.mono_bind_static_method ("[debugger-test] DebuggerTests.ValueTypesTest:MethodWithLocalStructs");
-				this.run_all = INTERNAL.mono_bind_static_method ("[debugger-test] DebuggerTest:run_all");
+				this.int_add = Module.INTERNAL.mono_bind_static_method ("[debugger-test] Math:IntAdd");
+				this.use_complex = Module.INTERNAL.mono_bind_static_method ("[debugger-test] Math:UseComplex");
+				this.delegates_test = Module.INTERNAL.mono_bind_static_method ("[debugger-test] Math:DelegatesTest");
+				this.generic_types_test = Module.INTERNAL.mono_bind_static_method ("[debugger-test] Math:GenericTypesTest");
+				this.outer_method = Module.INTERNAL.mono_bind_static_method ("[debugger-test] Math:OuterMethod");
+				this.async_method = Module.INTERNAL.mono_bind_static_method ("[debugger-test] Math/NestedInMath:AsyncTest");
+				this.method_with_structs = Module.INTERNAL.mono_bind_static_method ("[debugger-test] DebuggerTests.ValueTypesTest:MethodWithLocalStructs");
+				this.run_all = Module.INTERNAL.mono_bind_static_method ("[debugger-test] DebuggerTest:run_all");
 				this.static_method_table = {};
 				console.log ("ready");
 			},
@@ -21,7 +21,7 @@
 		function invoke_static_method (method_name, ...args) {
 			var method = App.static_method_table [method_name];
 			if (method == undefined)
-				method = App.static_method_table [method_name] = INTERNAL.mono_bind_static_method (method_name);
+				method = App.static_method_table [method_name] = Module.INTERNAL.mono_bind_static_method (method_name);
 
 			return method (...args);
 		}
@@ -29,7 +29,7 @@
 		async function invoke_static_method_async (method_name, ...args) {
 			var method = App.static_method_table [method_name];
 			if (method == undefined) {
-				method = App.static_method_table [method_name] = INTERNAL.mono_bind_static_method (method_name);
+				method = App.static_method_table [method_name] = Module.INTERNAL.mono_bind_static_method (method_name);
 			}
 
 			return await method (...args);
diff --git a/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js b/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js
index 1077c392283778..34755a44f222ca 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js
+++ b/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js
@@ -4,35 +4,36 @@
 "use strict";
 
 var Module = {
+	no_global_exports: true,
 	config: null,
 
 	preInit: async function () {
-		await MONO.mono_wasm_load_config("./mono-config.json"); // sets MONO.config implicitly
+		await Module.MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.MONO.config implicitly
 	},
 
 	// Called when the runtime is initialized and wasm is ready
 	onRuntimeInitialized: function () {
-		if (!MONO.config || MONO.config.error) {
+		if (!Module.MONO.config || Module.MONO.config.error) {
 			console.log("An error occured while loading the config file");
 			return;
 		}
 
-		MONO.config.loaded_cb = function () {
+		Module.MONO.config.loaded_cb = function () {
 			App.init();
 		};
 		// For custom logging patch the functions below
 		/*
-		INTERNAL.logging = {
+		Module.INTERNAL.logging = {
 			trace: function (domain, log_level, message, isFatal, dataPtr) {},
 			debugger: function (level, message) {}
 		};
-		MONO.mono_wasm_setenv ("MONO_LOG_LEVEL", "debug");
-		MONO.mono_wasm_setenv ("MONO_LOG_MASK", "all");
+		Module.MONO.mono_wasm_setenv ("MONO_LOG_LEVEL", "debug");
+		Module.MONO.mono_wasm_setenv ("MONO_LOG_MASK", "all");
 		*/
 
-		MONO.config.environment_variables = {
+		Module.MONO.config.environment_variables = {
 			"DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
 		};
-		MONO.mono_load_runtime_and_bcl_args(MONO.config)
+		Module.MONO.mono_load_runtime_and_bcl_args(Module.MONO.config)
 	},
 };
diff --git a/src/mono/wasm/runtime-test.js b/src/mono/wasm/runtime-test.js
index 384f31f15c6f2f..fc5e098180f8d1 100644
--- a/src/mono/wasm/runtime-test.js
+++ b/src/mono/wasm/runtime-test.js
@@ -10,42 +10,18 @@
 const is_browser = typeof window != "undefined";
 const is_node = !is_browser && typeof process != 'undefined';
 
+// setup the globalThis pollyfill as it is not defined on older versions of node
+if (is_node && !global.globalThis) {
+    global.globalThis = global;
+}
+
 // if the engine doesn't provide a console
-if (typeof (console) === "undefined") {
+if (typeof (globalThis.console) === "undefined") {
     globalThis.console = {
         log: globalThis.print,
         clear: function () { }
     };
 }
-globalThis.testConsole = console;
-
-//define arguments for later
-let allRuntimeArguments = null;
-try {
-    if (is_browser) {
-        // We expect to be run by tests/runtime/run.js which passes in the arguments using http parameters
-        const url = new URL(decodeURI(window.location));
-        allRuntimeArguments = [];
-        for (let param of url.searchParams) {
-            if (param[0] == "arg") {
-                allRuntimeArguments.push(param[1]);
-            }
-        }
-
-    } else if (typeof arguments !== "undefined" && typeof arguments !== "null") {
-        allRuntimeArguments = arguments;
-    } else if (typeof process !== 'undefined' && typeof process.argv !== "undefined") {
-        allRuntimeArguments = process.argv.slice(2);
-    } else if (typeof scriptArgs !== "undefined") {
-        allRuntimeArguments = scriptArgs;
-    } else if (typeof WScript !== "undefined" && WScript.Arguments) {
-        allRuntimeArguments = WScript.Arguments;
-    } else {
-        allRuntimeArguments = [];
-    }
-} catch (e) {
-    console.log(e);
-}
 
 function proxyMethod(prefix, func, asJson) {
     return function () {
@@ -76,7 +52,7 @@ function proxyMethod(prefix, func, asJson) {
 
 const methods = ["debug", "trace", "warn", "info", "error"];
 for (let m of methods) {
-    if (typeof (console[m]) != "function") {
+    if (typeof (console[m]) !== "function") {
         console[m] = proxyMethod(`console.${m}: `, console.log, false);
     }
 }
@@ -92,288 +68,389 @@ if (is_browser) {
     let consoleWebSocket = new WebSocket(consoleUrl);
     consoleWebSocket.onopen = function (event) {
         proxyJson(function (msg) { consoleWebSocket.send(msg); });
-        globalThis.testConsole.log("browser: Console websocket connected.");
+        console.log("browser: Console websocket connected.");
     };
     consoleWebSocket.onerror = function (event) {
-        console.log(`websocket error: ${event}`);
+        console.error(`websocket error: ${event}`);
     };
 }
-//proxyJson(console.log);
-
 
-let print = globalThis.testConsole.log;
-let printErr = globalThis.testConsole.error;
-
-if (typeof crypto === 'undefined') {
+if (typeof globalThis.crypto === 'undefined') {
     // **NOTE** this is a simple insecure polyfill for testing purposes only
     // /dev/random doesn't work on js shells, so define our own
     // See library_fs.js:createDefaultDevices ()
     globalThis.crypto = {
         getRandomValues: function (buffer) {
-            for (let i = 0; i < buffer.length; i++)
+            for (var i = 0; i < buffer.length; i++)
                 buffer[i] = (Math.random() * 256) | 0;
         }
     }
 }
-
-if (typeof performance == 'undefined') {
+if (is_node) {
+    var { performance } = require("perf_hooks");
+} else if (typeof performance === 'undefined') {
     // performance.now() is used by emscripten and doesn't work in JSC
-    globalThis.performance = {
+    var performance = {
         now: function () {
             return Date.now();
         }
     }
 }
 
-//end of all the nice shell glue code.
+// abstract all IO into a compact universally available method so that it is consistent and reliable
+const IOHandler = {
+    /** Load js file into project and evaluate it
+     * @type {(file: string) => Promise<void> | null}
+     * @param {string} file path to the file to load
+    */
+    load: null,
+
+    /** Read and return the contents of a file as a string
+     * @type {(file: string) => Promise<string> | null}
+     * @param {string} file the path to the file to read
+     * @return {string} the contents of the file
+    */
+    read: null,
+
+    /** Sets up the load and read functions for later
+     * @type {() => void}
+     */
+    init: function () {
+        // load: function that loads and executes a script
+        let loadFunc = globalThis.load; // shells (v8, JavaScriptCore, Spidermonkey)
+        if (!loadFunc) {
+            if (typeof WScript !== "undefined") { // Chakra
+                loadFunc = WScript.LoadScriptFile;
+
+            } else if (is_node) { // NodeJS
+                loadFunc = async function (file) {
+                    let req = require(file);
+
+                    // sometimes the require returns a function which returns a promise (such as in dotnet.js).
+                    // othertimes it returns the variable or object that is needed. We handle both cases
+                    if (typeof (req) === 'function') {
+                        req = await req(Module); // pass Module so emsdk can use it
+                    }
+
+                    // add to Module
+                    Module = Object.assign(req, Module);
+                };
+            } else if (is_browser) { // vanila JS in browser
+                loadFunc = function (file) {
+                    const script = document.createElement("script");
+                    script.src = file;
+                    document.head.appendChild(script);
+                }
+            }
+        }
+        IOHandler.load = async (file) => await loadFunc(file);
+
+        // read: function that just reads a file into a variable
+        let readFunc = globalThis.read; // shells (v8, JavaScriptCore, Spidermonkey)
+        if (!readFunc) {
+            if (typeof WScript !== "undefined") {
+                readFunc = WScript.LoadBinaryFile; // Chakra
+
+            } else if (is_node) { // NodeJS
+                const fs = require('fs');
+                readFunc = function (path) {
+                    return fs.readFileSync(path).toString();
+                };
+            } else if (is_browser) {  // vanila JS in browser
+                readFunc = fetch;
+            }
+        }
+        IOHandler.read = async (file) => await readFunc(file);
+    },
+
+    /** Returns an async fetch request
+     * @type {(path: string, params: object) => Promise<{ok: boolean, url: string, arrayBuffer: Promise<Uint8Array>}>}
+     * @param {string} path the path to the file to fetch
+     * @param {object} params additional parameters to fetch with. Only used on browser
+     * @returns {Promise<{ok: boolean, url: string, arrayBuffer: Promise<Uint8Array>}>} The result of the request
+     */
+    fetch: function (path, params) {
+        if (is_browser) {
+            return fetch(path, params);
+
+        } else { // shells and node
+            return new Promise((resolve, reject) => {
+                let bytes = null, error = null;
+                try {
+                    if (is_node) {
+                        const fs = require('fs');
+                        bytes = fs.readFileSync(path);
+                    } else {
+                        bytes = read(path, 'binary');
+                    }
+                } catch (exc) {
+                    error = exc;
+                }
+                const response = {
+                    ok: (bytes && !error),
+                    url: path,
+                    arrayBuffer: function () {
+                        return new Promise((resolve2, reject2) => {
+                            if (error)
+                                reject2(error);
+                            else
+                                resolve2(new Uint8Array(bytes));
+                        }
+                        )
+                    }
+                }
+                resolve(response);
+            });
+        }
+    }
+};
+IOHandler.init();
+// end of all the nice shell glue code.
 
-function test_exit(exit_code) {
+function fail_exec(exit_code, reason) {
+    if (reason) {
+        console.error(reason);
+    }
     if (is_browser) {
         // Notify the selenium script
         Module.exit_code = exit_code;
-        Module.print("WASM EXIT " + exit_code);
+        console.log("WASM EXIT " + exit_code);
         const tests_done_elem = document.createElement("label");
         tests_done_elem.id = "tests_done";
         tests_done_elem.innerHTML = exit_code.toString();
         document.body.appendChild(tests_done_elem);
-    } else {
-        INTERNAL.mono_wasm_exit(exit_code);
+    } else { // shell or node
+        Module.INTERNAL.mono_wasm_exit(exit_code);
     }
 }
 
-function fail_exec(reason) {
-    Module.print(reason);
-    test_exit(1);
-}
-
-function inspect_object(o) {
-    const r = "";
-    for (let p in o) {
-        const t = typeof o[p];
-        r += "'" + p + "' => '" + t + "', ";
+let processedArguments = null;
+// this can't be function because of `arguments` scope
+try {
+    if (is_node) {
+        processedArguments = processArguments(process.argv.slice(2));
+    } else if (is_browser) {
+        // We expect to be run by tests/runtime/run.js which passes in the arguments using http parameters
+        const url = new URL(decodeURI(window.location));
+        let urlArguments = []
+        for (let param of url.searchParams) {
+            if (param[0] == "arg") {
+                urlArguments.push(param[1]);
+            }
+        }
+        processedArguments = processArguments(urlArguments);
+    } else if (typeof arguments !== "undefined") {
+        processedArguments = processArguments(Array.from(arguments));
+    } else if (typeof scriptArgs !== "undefined") {
+        processedArguments = processArguments(Array.from(scriptArgs));
+    } else if (typeof WScript !== "undefined" && WScript.Arguments) {
+        processedArguments = processArguments(Array.from(WScript.Arguments));
     }
-    return r;
+} catch (e) {
+    console.error(e);
 }
 
-// Preprocess arguments
-console.info("Arguments: " + allRuntimeArguments);
-const profilers = [];
-const setenv = {};
-const runtime_args = [];
-let enable_gc = true;
-let working_dir = '/';
-while (allRuntimeArguments !== undefined && allRuntimeArguments.length > 0) {
-    if (allRuntimeArguments[0].startsWith("--profile=")) {
-        const arg = allRuntimeArguments[0].substring("--profile=".length);
-
-        profilers.push(arg);
-
-        allRuntimeArguments = allRuntimeArguments.slice(1);
-    } else if (allRuntimeArguments[0].startsWith("--setenv=")) {
-        const arg = allRuntimeArguments[0].substring("--setenv=".length);
-        const parts = arg.split('=');
-        if (parts.length != 2)
-            fail_exec("Error: malformed argument: '" + allRuntimeArguments[0]);
-        setenv[parts[0]] = parts[1];
-        allRuntimeArguments = allRuntimeArguments.slice(1);
-    } else if (allRuntimeArguments[0].startsWith("--runtime-arg=")) {
-        const arg = allRuntimeArguments[0].substring("--runtime-arg=".length);
-        runtime_args.push(arg);
-        allRuntimeArguments = allRuntimeArguments.slice(1);
-    } else if (allRuntimeArguments[0] == "--disable-on-demand-gc") {
-        enable_gc = false;
-        allRuntimeArguments = allRuntimeArguments.slice(1);
-    } else if (allRuntimeArguments[0].startsWith("--working-dir=")) {
-        const arg = allRuntimeArguments[0].substring("--working-dir=".length);
-        working_dir = arg;
-        allRuntimeArguments = allRuntimeArguments.slice(1);
-    } else {
-        break;
+function processArguments(incommingArguments) {
+    console.log("Incomming arguments: " + incommingArguments.join(' '));
+    let profilers = [];
+    let setenv = {};
+    let runtime_args = [];
+    let enable_gc = true;
+    let working_dir = '/';
+    while (incommingArguments && incommingArguments.length > 0) {
+        const currentArg = incommingArguments[0];
+        if (currentArg.startsWith("--profile=")) {
+            const arg = currentArg.substring("--profile=".length);
+            profilers.push(arg);
+        } else if (currentArg.startsWith("--setenv=")) {
+            const arg = currentArg.substring("--setenv=".length);
+            const parts = arg.split('=');
+            if (parts.length != 2)
+                fail_exec(1, "Error: malformed argument: '" + currentArg);
+            setenv[parts[0]] = parts[1];
+        } else if (currentArg.startsWith("--runtime-arg=")) {
+            const arg = currentArg.substring("--runtime-arg=".length);
+            runtime_args.push(arg);
+        } else if (currentArg == "--disable-on-demand-gc") {
+            enable_gc = false;
+        } else if (currentArg.startsWith("--working-dir=")) {
+            const arg = currentArg.substring("--working-dir=".length);
+            working_dir = arg;
+        } else {
+            break;
+        }
+        incommingArguments = incommingArguments.slice(1);
     }
-}
 
-// cheap way to let the testing infrastructure know we're running in a browser context (or not)
-setenv["IsBrowserDomSupported"] = is_browser.toString().toLowerCase();
+    // cheap way to let the testing infrastructure know we're running in a browser context (or not)
+    setenv["IsBrowserDomSupported"] = is_browser.toString().toLowerCase();
 
-function writeContentToFile(content, path) {
-    const stream = FS.open(path, 'w+');
-    FS.write(stream, content, 0, content.length, 0);
-    FS.close(stream);
-}
+    console.log("Application arguments: " + incommingArguments.join(' '));
 
-function loadScript(url) {
-    if (is_browser) {
-        const script = document.createElement("script");
-        script.src = url;
-        document.head.appendChild(script);
-    } else {
-        load(url);
+    return {
+        applicationArgs: incommingArguments,
+        profilers,
+        setenv,
+        runtime_args,
+        enable_gc,
+        working_dir,
     }
 }
 
+// must be var as dotnet.js uses it
 var Module = {
+    no_global_exports: true,
     mainScriptUrlOrBlob: "dotnet.js",
     config: null,
-    print,
-    printErr,
 
+    /** Called before the runtime is loaded and before it is run
+     * @type {() => Promise<void>}
+     */
     preInit: async function () {
-        await MONO.mono_wasm_load_config("./mono-config.json"); // sets MONO.config implicitly
+        await Module.MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.config implicitly
     },
 
+    /** Called after an exception occurs during execution
+     * @type {(x: string|number=) => void}
+     * @param {string|number} x error message
+     */
     onAbort: function (x) {
-        print("ABORT: " + x);
+        console.log("ABORT: " + x);
         const err = new Error();
-        print("Stacktrace: \n");
-        print(err.stack);
-        test_exit(1);
+        console.log("Stacktrace: \n");
+        console.error(err.stack);
+        fail_exec(1);
     },
 
+    /** Called after the runtime is loaded but before it is run mostly prepares runtime and config for the tests
+     * @type {() => void}
+     */
     onRuntimeInitialized: function () {
+        if (!Module.config) {
+            console.error("Could not find ./mono-config.json. Cancelling run");
+            fail_exec(1);
+        }
         // Have to set env vars here to enable setting MONO_LOG_LEVEL etc.
-        for (let variable in setenv) {
-            MONO.mono_wasm_setenv(variable, setenv[variable]);
+        for (let variable in processedArguments.setenv) {
+            Module.MONO.mono_wasm_setenv(variable, processedArguments.setenv[variable]);
         }
 
-        if (!enable_gc) {
-            INTERNAL.mono_wasm_enable_on_demand_gc(0);
+        if (!processedArguments.enable_gc) {
+            Module.INTERNAL.mono_wasm_enable_on_demand_gc(0);
         }
 
-        MONO.config.loaded_cb = function () {
-            let wds = FS.stat(working_dir);
-            if (wds === undefined || !FS.isDir(wds.mode)) {
-                fail_exec(`Could not find working directory ${working_dir}`);
+        Module.config.loaded_cb = function () {
+            let wds = Module.FS.stat(processedArguments.working_dir);
+            if (wds === undefined || !Module.FS.isDir(wds.mode)) {
+                fail_exec(1, `Could not find working directory ${processedArguments.working_dir}`);
                 return;
             }
 
-            FS.chdir(working_dir);
+            Module.FS.chdir(processedArguments.working_dir);
             App.init();
         };
-        MONO.config.fetch_file_cb = function (asset) {
-            // console.log("fetch_file_cb('" + asset + "')");
-            // for testing purposes add BCL assets to VFS until we special case File.Open
-            // to identify when an assembly from the BCL is being open and resolve it correctly.
-            /*
-            const content = new Uint8Array (read (asset, 'binary'));
-            const path = asset.substr(MONO.config.deploy_prefix.length);
-            writeContentToFile(content, path);
-            */
-
-            if (typeof window != 'undefined') {
-                return fetch(asset, { credentials: 'same-origin' });
-            } else {
-                // The default mono_load_runtime_and_bcl defaults to using
-                // fetch to load the assets.  It also provides a way to set a
-                // fetch promise callback.
-                // Here we wrap the file read in a promise and fake a fetch response
-                // structure.
-                return new Promise((resolve, reject) => {
-                    let bytes = null, error = null;
-                    try {
-                        bytes = read(asset, 'binary');
-                    } catch (exc) {
-                        console.log('v8 file read failed ' + asset + ' ' + exc)
-                        error = exc;
-                    }
-                    const response = {
-                        ok: (bytes && !error), url: asset,
-                        arrayBuffer: function () {
-                            return new Promise((resolve2, reject2) => {
-                                if (error)
-                                    reject2(error);
-                                else
-                                    resolve2(new Uint8Array(bytes));
-                            }
-                            )
-                        }
-                    }
-                    resolve(response);
-                })
-            }
+        Module.config.fetch_file_cb = function (asset) {
+            return IOHandler.fetch(asset, { credentials: 'same-origin' });
         };
 
-        MONO.mono_load_runtime_and_bcl_args(MONO.config);
+        Module.MONO.mono_load_runtime_and_bcl_args(Module.config);
     },
 };
-loadScript("dotnet.js");
-
-const IGNORE_PARAM_COUNT = -1;
 
-const App = {
+var App = {
+    /** Runs the tests (runtime is now loaded and running)
+     * @type {() => void}
+     */
     init: function () {
         console.info("Initializing.....");
 
-        for (let i = 0; i < profilers.length; ++i) {
-            const init = Module.cwrap('mono_wasm_load_profiler_' + profilers[i], 'void', ['string'])
-
+        for (let i = 0; i < processedArguments.profilers.length; ++i) {
+            const init = Module.cwrap('mono_wasm_load_profiler_' + processedArguments.profilers[i], 'void', ['string']);
             init("");
         }
 
-        if (allRuntimeArguments.length == 0) {
-            fail_exec("Missing required --run argument");
+        if (processedArguments.applicationArgs.length == 0) {
+            fail_exec(1, "Missing required --run argument");
             return;
         }
 
-        if (allRuntimeArguments[0] == "--regression") {
+        if (processedArguments.applicationArgs[0] == "--regression") {
+            const exec_regression = Module.cwrap('mono_wasm_exec_regression', 'number', ['number', 'string']);
+
             let res = 0;
             try {
-                res = INTERNAL.mono_wasm_exec_regression(10, allRuntimeArguments[1]);
-                Module.print("REGRESSION RESULT: " + res);
+                res = exec_regression(10, processedArguments.applicationArgs[1]);
+                console.log("REGRESSION RESULT: " + res);
             } catch (e) {
-                Module.print("ABORT: " + e);
-                print(e.stack);
+                console.error("ABORT: " + e);
+                console.error(e.stack);
                 res = 1;
             }
 
             if (res)
-                fail_exec("REGRESSION TEST FAILED");
+                fail_exec(1, "REGRESSION TEST FAILED");
 
             return;
         }
 
-        if (runtime_args.length > 0)
-            INTERNAL.mono_wasm_set_runtime_options(runtime_args);
+        if (processedArguments.runtime_args.length > 0)
+            Module.INTERNAL.mono_wasm_set_runtime_options(processedArguments.runtime_args);
 
-        if (allRuntimeArguments[0] == "--run") {
+        if (processedArguments.applicationArgs[0] == "--run") {
             // Run an exe
-            if (allRuntimeArguments.length == 1) {
-                fail_exec("Error: Missing main executable argument.");
+            if (processedArguments.applicationArgs.length == 1) {
+                fail_exec(1, "Error: Missing main executable argument.");
                 return;
             }
 
-            const main_assembly_name = allRuntimeArguments[1];
-            const app_args = allRuntimeArguments.slice(2);
-            INTERNAL.mono_wasm_set_main_args(allRuntimeArguments[1], app_args);
+            const main_assembly_name = processedArguments.applicationArgs[1];
+            const app_args = processedArguments.applicationArgs.slice(2);
+            Module.INTERNAL.mono_wasm_set_main_args(processedArguments.applicationArgs[1], app_args);
 
             // Automatic signature isn't working correctly
-            let result = BINDING.call_assembly_entry_point(main_assembly_name, [app_args], "m");
-            let onError = function (error) {
+            const result = Module.BINDING.call_assembly_entry_point(main_assembly_name, [app_args], "m");
+            const onError = function (error) {
                 console.error(error);
                 if (error.stack)
                     console.error(error.stack);
 
-                test_exit(1);
+                fail_exec(1);
             }
             try {
-                result.then(test_exit).catch(onError);
+                result.then(fail_exec).catch(onError);
             } catch (error) {
                 onError(error);
             }
 
         } else {
-            fail_exec("Unhandled argument: " + allRuntimeArguments[0]);
+            fail_exec(1, "Unhandled argument: " + processedArguments.applicationArgs[0]);
         }
     },
+
+    /** Runs a particular test
+     * @type {(method_name: string, args: any[]=, signature: any=) => return number}
+     */
     call_test_method: function (method_name, args, signature) {
+        // note: arguments here is the array of arguments passsed to this function
         if ((arguments.length > 2) && (typeof (signature) !== "string"))
             throw new Error("Invalid number of arguments for call_test_method");
 
         const fqn = "[System.Private.Runtime.InteropServices.JavaScript.Tests]System.Runtime.InteropServices.JavaScript.Tests.HelperMarshal:" + method_name;
         try {
-            return INTERNAL.call_static_method(fqn, args || [], signature);
+            return Module.INTERNAL.call_static_method(fqn, args || [], signature);
         } catch (exc) {
             console.error("exception thrown in", fqn);
             throw exc;
         }
     }
 };
+globalThis.App = App; // Necessary as System.Runtime.InteropServices.JavaScript.Tests.MarshalTests (among others) call the App.call_test_method directly
+
+// load the config and runtime files which will start the runtime init and subsiquently the tests
+// uses promise chain as loading is async but we can't use await here
+IOHandler
+    .load("./dotnet.js")
+    .catch(function (err) {
+        console.error(err);
+        fail_exec(1, "failed to load the dotnet.js file");
+    });
\ No newline at end of file
diff --git a/src/mono/wasm/runtime/.eslintrc.js b/src/mono/wasm/runtime/.eslintrc.js
index 43876b2a90aca1..0dbfcdc591e4c0 100644
--- a/src/mono/wasm/runtime/.eslintrc.js
+++ b/src/mono/wasm/runtime/.eslintrc.js
@@ -16,7 +16,11 @@ module.exports = {
     "plugins": [
         "@typescript-eslint"
     ],
-    "ignorePatterns": ["node_modules/**/*.*", "bin/**/*.*"],
+    "ignorePatterns": [
+        "node_modules/**/*.*",
+        "bin/**/*.*",
+        "modularize*.js"
+    ],
     "rules": {
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
diff --git a/src/mono/wasm/runtime/CMakeLists.txt b/src/mono/wasm/runtime/CMakeLists.txt
index 450d8df3918b8b..78a691b6d90b21 100644
--- a/src/mono/wasm/runtime/CMakeLists.txt
+++ b/src/mono/wasm/runtime/CMakeLists.txt
@@ -24,8 +24,8 @@ target_link_libraries(dotnet
     ${NATIVE_BIN_DIR}/libSystem.IO.Compression.Native.a)
 
 set_target_properties(dotnet PROPERTIES
-    LINK_DEPENDS "${NATIVE_BIN_DIR}/src/emcc-default.rsp;${NATIVE_BIN_DIR}/src/runtime.iffe.js;${SOURCE_DIR}/library-dotnet.js;${SYSTEM_NATIVE_DIR}/pal_random.js"
-    LINK_FLAGS "@${NATIVE_BIN_DIR}/src/emcc-default.rsp ${CONFIGURATION_LINK_FLAGS} -DENABLE_NETCORE=1 --pre-js ${NATIVE_BIN_DIR}/src/runtime.iffe.js --js-library ${SOURCE_DIR}/library-dotnet.js --js-library ${SYSTEM_NATIVE_DIR}/pal_random.js"
+    LINK_DEPENDS "${NATIVE_BIN_DIR}/src/emcc-default.rsp;${NATIVE_BIN_DIR}/src/runtime.iffe.js;${SOURCE_DIR}/library-dotnet.js;${SOURCE_DIR}/modularize-dotnet.pre.js;${SOURCE_DIR}/modularize-dotnet.post.js;${SYSTEM_NATIVE_DIR}/pal_random.js"
+    LINK_FLAGS "@${NATIVE_BIN_DIR}/src/emcc-default.rsp ${CONFIGURATION_LINK_FLAGS} -DENABLE_NETCORE=1 --pre-js ${SOURCE_DIR}/modularize-dotnet.pre.js --pre-js ${NATIVE_BIN_DIR}/src/runtime.iffe.js --js-library ${SOURCE_DIR}/library-dotnet.js --js-library ${SYSTEM_NATIVE_DIR}/pal_random.js --post-js ${SOURCE_DIR}/modularize-dotnet.post.js"
     RUNTIME_OUTPUT_DIRECTORY "${NATIVE_BIN_DIR}")
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
diff --git a/src/mono/wasm/runtime/corebindings.c b/src/mono/wasm/runtime/corebindings.c
index df4d6cf5fd3fb9..fbfb5c42017986 100644
--- a/src/mono/wasm/runtime/corebindings.c
+++ b/src/mono/wasm/runtime/corebindings.c
@@ -30,47 +30,7 @@ extern MonoObject* mono_wasm_web_socket_send (int webSocket_js_handle, void* buf
 extern MonoObject* mono_wasm_web_socket_receive (int webSocket_js_handle, void* buffer_ptr, int offset, int length, void* response_ptr, int *thenable_js_handle, int *is_exception);
 extern MonoObject* mono_wasm_web_socket_close (int webSocket_js_handle, int code, MonoString * reason, int wait_for_close_received, int *thenable_js_handle, int *is_exception);
 extern MonoString* mono_wasm_web_socket_abort (int webSocket_js_handle, int *is_exception);
-
-// Compiles a JavaScript function from the function data passed.
-// Note: code snippet is not a function definition. Instead it must create and return a function instance.
-EM_JS(MonoObject*, compile_function, (int snippet_ptr, int len, int *is_exception), {
-	try {
-		var data = INTERNAL.string_decoder.decode (snippet_ptr, snippet_ptr + len);
-		var wrapper = '(function () { ' + data + ' })';
-		var funcFactory = eval(wrapper);
-		var func = funcFactory();
-		if (typeof func !== 'function') {
-			throw new Error('Code must return an instance of a JavaScript function. '
-				+ 'Please use `return` statement to return a function.');
-		}
-		setValue (is_exception, 0, "i32");
-		return BINDING.js_to_mono_obj (func, true);	
-	}
-	catch (e)
-	{
-		res = e.toString ();
-		setValue (is_exception, 1, "i32");
-		if (res === null || res === undefined)
-			res = "unknown exception";
-		return BINDING.js_to_mono_obj (res, true);
-	}
-});
-
-static MonoObject*
-mono_wasm_compile_function (MonoString *str, int *is_exception)
-{
-	if (str == NULL)
-	 	return NULL;
-	//char *native_val = mono_string_to_utf8 (str);
-	mono_unichar2 *native_val = mono_string_chars (str);
-	int native_len = mono_string_length (str) * 2;
-
-	MonoObject* native_res =  compile_function((int)native_val, native_len, is_exception);
-	mono_free (native_val);
-	if (native_res == NULL)
-	 	return NULL;
-	return native_res;
-}
+extern MonoObject* mono_wasm_compile_function (MonoString *str, int *is_exception);
 
 void core_initialize_internals ()
 {
diff --git a/src/mono/wasm/runtime/driver.c b/src/mono/wasm/runtime/driver.c
index 45186acdbb76b0..efd04dafda5c62 100644
--- a/src/mono/wasm/runtime/driver.c
+++ b/src/mono/wasm/runtime/driver.c
@@ -30,11 +30,10 @@
 void core_initialize_internals ();
 #endif
 
+extern MonoString* mono_wasm_invoke_js (MonoString *str, int *is_exception);
+
 // Blazor specific custom routines - see dotnet_support.js for backing code
 extern void* mono_wasm_invoke_js_blazor (MonoString **exceptionMessage, void *callInfo, void* arg0, void* arg1, void* arg2);
-// The following two are for back-compat and will eventually be removed
-extern void* mono_wasm_invoke_js_marshalled (MonoString **exceptionMessage, void *asyncHandleLongPtr, MonoString *funcName, MonoString *argsJson);
-extern void* mono_wasm_invoke_js_unmarshalled (MonoString **exceptionMessage, MonoString *funcName, void* arg0, void* arg1, void* arg2);
 
 void mono_wasm_enable_debugging (int);
 
@@ -95,55 +94,6 @@ static MonoDomain *root_domain;
 
 #define RUNTIMECONFIG_BIN_FILE "runtimeconfig.bin"
 
-static MonoString*
-mono_wasm_invoke_js (MonoString *str, int *is_exception)
-{
-	if (str == NULL)
-		return NULL;
-
-	int native_res_len = 0;
-	int *p_native_res_len = &native_res_len;
-
-	mono_unichar2 *native_res = (mono_unichar2*)EM_ASM_INT ({
-		var js_str = INTERNAL.string_decoder.copy ($0);
-
-		try {
-			var res = eval (js_str);
-			setValue ($2, 0, "i32");
-			if (res === null || res === undefined)
-				return 0;
-			else
-				res = res.toString ();
-		} catch (e) {
-			res = e.toString();
-			setValue ($2, 1, "i32");
-			if (res === null || res === undefined)
-				res = "unknown exception";
-
-			var stack = e.stack;
-			if (stack) {
-				// Some JS runtimes insert the error message at the top of the stack, some don't,
-				//  so normalize it by using the stack as the result if it already contains the error
-				if (stack.startsWith(res))
-					res = stack;
-				else
- 					res += "\n" + stack;
- 			}
-		}
-		var buff = Module._malloc((res.length + 1) * 2);
-		stringToUTF16 (res, buff, (res.length + 1) * 2);
-		setValue ($1, res.length, "i32");
-		return buff;
-	}, (int)str, p_native_res_len, is_exception);
-
-	if (native_res == NULL)
-		return NULL;
-
-	MonoString *res = mono_string_new_utf16 (mono_domain_get (), native_res, native_res_len);
-	free (native_res);
-	return res;
-}
-
 static void
 wasm_trace_logger (const char *log_domain, const char *log_level, const char *message, mono_bool fatal, void *user_data)
 {
@@ -450,9 +400,6 @@ void mono_initialize_internals ()
 
 	// Blazor specific custom routines - see dotnet_support.js for backing code
 	mono_add_internal_call ("WebAssembly.JSInterop.InternalCalls::InvokeJS", mono_wasm_invoke_js_blazor);
-	// The following two are for back-compat and will eventually be removed
-	mono_add_internal_call ("WebAssembly.JSInterop.InternalCalls::InvokeJSMarshalled", mono_wasm_invoke_js_marshalled);
-	mono_add_internal_call ("WebAssembly.JSInterop.InternalCalls::InvokeJSUnmarshalled", mono_wasm_invoke_js_unmarshalled);
 
 #ifdef CORE_BINDINGS
 	core_initialize_internals();
diff --git a/src/mono/wasm/runtime/exports.ts b/src/mono/wasm/runtime/exports.ts
index 9277892a204782..0fd4655e4abe57 100644
--- a/src/mono/wasm/runtime/exports.ts
+++ b/src/mono/wasm/runtime/exports.ts
@@ -26,7 +26,7 @@ import {
     mono_load_runtime_and_bcl_args, mono_wasm_load_config,
     mono_wasm_setenv, mono_wasm_set_runtime_options,
     mono_wasm_load_data_archive, mono_wasm_asm_loaded,
-    mono_wasm_invoke_js_blazor, mono_wasm_invoke_js_marshalled, mono_wasm_invoke_js_unmarshalled, mono_wasm_set_main_args
+    mono_wasm_set_main_args
 } from "./startup";
 import { mono_set_timeout, schedule_background_exec } from "./scheduling";
 import { mono_wasm_load_icu_data, mono_wasm_get_icudt_name } from "./icu";
@@ -39,7 +39,10 @@ import {
 import {
     call_static_method, mono_bind_static_method, mono_call_assembly_entry_point,
     mono_method_resolve,
+    mono_wasm_compile_function,
     mono_wasm_get_by_index, mono_wasm_get_global_object, mono_wasm_get_object_property,
+    mono_wasm_invoke_js,
+    mono_wasm_invoke_js_blazor,
     mono_wasm_invoke_js_with_args, mono_wasm_set_by_index, mono_wasm_set_object_property,
     _get_args_root_buffer_for_method_call, _get_buffer_for_method_call,
     _handle_exception_for_call, _teardown_after_call
@@ -65,6 +68,10 @@ export const MONO: MONO = <any>{
     mono_wasm_new_root,
     mono_wasm_release_roots,
 
+    // for Blazor's future!
+    mono_wasm_add_assembly: cwraps.mono_wasm_add_assembly,
+    mono_wasm_load_runtime: cwraps.mono_wasm_load_runtime,
+
     config: runtimeHelpers.config,
     loaded_files: runtimeHelpers.loaded_files,
 
@@ -121,11 +128,28 @@ function export_to_emscripten(dotnet: any, mono: any, binding: any, internal: an
 
     // here we expose objects used in tests to global namespace
     if (!module.no_global_exports) {
-        (<any>globalThis).DOTNET = dotnet;
-        (<any>globalThis).MONO = mono;
-        (<any>globalThis).BINDING = binding;
-        (<any>globalThis).INTERNAL = internal;
         (<any>globalThis).Module = module;
+        const warnWrap = (name: string, value: any) => {
+            let warnOnce = true;
+            Object.defineProperty(globalThis, name, {
+                get: () => {
+                    if (warnOnce) {
+                        const stack = (new Error()).stack;
+                        const nextLine = stack ? stack.substr(stack.indexOf("\n", 8) + 1) : "";
+                        console.warn(`global ${name} is obsolete, please use Module.${name} instead ${nextLine}`);
+                        warnOnce = false;
+                    }
+                    return value;
+                }
+            });
+        };
+        warnWrap("MONO", mono);
+        warnWrap("BINDING", binding);
+
+        // Blazor back compat
+        warnWrap("cwrap", Module.cwrap);
+        warnWrap("addRunDependency", Module.addRunDependency);
+        warnWrap("removeRunDependency", Module.removeRunDependency);
     }
 }
 
@@ -143,9 +167,8 @@ const linker_exports = {
     schedule_background_exec,
 
     // also keep in sync with driver.c
+    mono_wasm_invoke_js,
     mono_wasm_invoke_js_blazor,
-    mono_wasm_invoke_js_marshalled,
-    mono_wasm_invoke_js_unmarshalled,
 
     // also keep in sync with corebindings.c
     mono_wasm_invoke_js_with_args,
@@ -168,6 +191,7 @@ const linker_exports = {
     mono_wasm_web_socket_receive,
     mono_wasm_web_socket_close,
     mono_wasm_web_socket_abort,
+    mono_wasm_compile_function,
 
     //  also keep in sync with pal_icushim_static.c
     mono_wasm_load_icu_data,
@@ -232,6 +256,10 @@ export interface MONO {
     mono_wasm_new_root: typeof mono_wasm_new_root;
     mono_wasm_release_roots: typeof mono_wasm_release_roots;
 
+    // for Blazor's future!
+    mono_wasm_add_assembly: typeof cwraps.mono_wasm_add_assembly,
+    mono_wasm_load_runtime: typeof cwraps.mono_wasm_load_runtime,
+
     loaded_files: string[];
     config: MonoConfig | MonoConfigError,
 }
diff --git a/src/mono/wasm/runtime/library-dotnet.js b/src/mono/wasm/runtime/library-dotnet.js
index 1362821915f806..a999659b1949dd 100644
--- a/src/mono/wasm/runtime/library-dotnet.js
+++ b/src/mono/wasm/runtime/library-dotnet.js
@@ -5,13 +5,9 @@
 "use strict";
 
 const DotNetSupportLib = {
-    // this will become globalThis.DOTNET
     $DOTNET: {},
-    // this will become globalThis.MONO
     $MONO: {},
-    // this will become globalThis.BINDING
     $BINDING: {},
-    // this will become globalThis.INTERNAL
     $INTERNAL: {},
     // this line will be executed on runtime, populating the objects with methods
     $DOTNET__postset: "__dotnet_runtime.INTERNAL.export_to_emscripten (DOTNET, MONO, BINDING, INTERNAL, Module);",
@@ -31,9 +27,8 @@ const linked_functions = [
     "schedule_background_exec",
 
     // driver.c
+    "mono_wasm_invoke_js",
     "mono_wasm_invoke_js_blazor",
-    "mono_wasm_invoke_js_marshalled",
-    "mono_wasm_invoke_js_unmarshalled",
 
     // corebindings.c
     "mono_wasm_invoke_js_with_args",
@@ -56,6 +51,7 @@ const linked_functions = [
     "mono_wasm_web_socket_receive",
     "mono_wasm_web_socket_close",
     "mono_wasm_web_socket_abort",
+    "mono_wasm_compile_function",
 
     // pal_icushim_static.c
     "mono_wasm_load_icu_data",
diff --git a/src/mono/wasm/runtime/method-calls.ts b/src/mono/wasm/runtime/method-calls.ts
index 3847bc09c1a059..c893ada0c823d3 100644
--- a/src/mono/wasm/runtime/method-calls.ts
+++ b/src/mono/wasm/runtime/method-calls.ts
@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 import { mono_wasm_new_root, mono_wasm_new_root_buffer, WasmRoot, WasmRootBuffer } from "./roots";
-import { JSHandle, MonoArray, MonoMethod, MonoObject, MonoObjectNull, MonoString, coerceNull as coerceNull, VoidPtrNull, VoidPtr, Int32Ptr } from "./types";
-import { Module, runtimeHelpers } from "./modules";
+import { JSHandle, MonoArray, MonoMethod, MonoObject, MonoObjectNull, MonoString, coerceNull as coerceNull, VoidPtrNull, VoidPtr, Int32Ptr, MonoStringNull } from "./types";
+import { Module, MONO, BINDING, INTERNAL, runtimeHelpers } from "./modules";
 import { _mono_array_root_to_js_array, _unbox_mono_obj_root } from "./cs-to-js";
 import { get_js_obj, mono_wasm_get_jsobj_from_js_handle } from "./gc-handles";
 import { js_array_to_mono_array, _box_js_bool, _js_to_mono_obj } from "./js-to-cs";
@@ -396,6 +396,15 @@ export function wrap_error(is_exception: Int32Ptr | null, ex: any): MonoString {
     let res = "unknown exception";
     if (ex) {
         res = ex.toString();
+        const stack = ex.stack;
+        if (stack) {
+            // Some JS runtimes insert the error message at the top of the stack, some don't,
+            //  so normalize it by using the stack as the result if it already contains the error
+            if (stack.startsWith(res))
+                res = stack;
+            else
+                res += "\n" + stack;
+        }
     }
     if (is_exception) {
         Module.setValue(is_exception, 1, "i32");
@@ -447,3 +456,72 @@ export function mono_method_resolve(fqn: string): MonoMethod {
         throw new Error("Could not find method: " + methodname);
     return method;
 }
+
+// Blazor specific custom routine
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export function mono_wasm_invoke_js_blazor(exceptionMessage: Int32Ptr, callInfo: any, arg0: any, arg1: any, arg2: any): void | number {
+    try {
+        const blazorExports = (<any>globalThis).Blazor;
+        if (!blazorExports) {
+            throw new Error("The blazor.webassembly.js library is not loaded.");
+        }
+
+        return blazorExports._internal.invokeJSFromDotNet(callInfo, arg0, arg1, arg2);
+    } catch (ex: any) {
+        const exceptionJsString = ex.message + "\n" + ex.stack;
+        const exceptionSystemString = cwraps.mono_wasm_string_from_js(exceptionJsString);
+        Module.setValue(exceptionMessage, <any>exceptionSystemString, "i32"); // *exceptionMessage = exceptionSystemString;
+        return 0;
+    }
+}
+
+// code like `App.call_test_method();`
+export function mono_wasm_invoke_js(code: MonoString, is_exception: Int32Ptr): MonoString | null {
+    if (code === MonoStringNull)
+        return MonoStringNull;
+
+    const js_code = conv_string(code);
+
+    try {
+        const closure = {
+            Module, MONO, BINDING, INTERNAL
+        };
+        const fn_body_template = `const {Module, MONO, BINDING, INTERNAL} = __closure; const __fn = function(){ ${js_code} }; return __fn.call(__closure);`;
+        const fn_defn = new Function("__closure", fn_body_template);
+        const res = fn_defn(closure);
+        Module.setValue(is_exception, 0, "i32");
+        if (typeof res === "undefined" || res === null)
+            return MonoStringNull;
+        if (typeof res !== "string")
+            return wrap_error(is_exception, `Code could return an instance of a JavaScript string. It was ${typeof res}.`);
+        return js_string_to_mono_string(res);
+    } catch (ex) {
+        return wrap_error(is_exception, ex);
+    }
+}
+
+// TODO is this unused code ?
+// Compiles a JavaScript function from the function data passed.
+// Note: code snippet is not a function definition. Instead it must create and return a function instance.
+// code like `return function() { App.call_test_method(); };`
+export function mono_wasm_compile_function(code: MonoString, is_exception: Int32Ptr): MonoObject {
+    if (code === MonoStringNull)
+        return MonoStringNull;
+
+    const js_code = conv_string(code);
+
+    try {
+        const closure = {
+            Module, MONO, BINDING, INTERNAL
+        };
+        const fn_body_template = `const {Module, MONO, BINDING, INTERNAL} = __closure; ${js_code} ;`;
+        const fn_defn = new Function("__closure", fn_body_template);
+        const res = fn_defn(closure);
+        if (!res || typeof res !== "function")
+            return wrap_error(is_exception, "Code must return an instance of a JavaScript function. Please use `return` statement to return a function.");
+        Module.setValue(is_exception, 0, "i32");
+        return _js_to_mono_obj(true, res);
+    } catch (ex) {
+        return wrap_error(is_exception, ex);
+    }
+}
\ No newline at end of file
diff --git a/src/mono/wasm/runtime/modularize-dotnet.post.js b/src/mono/wasm/runtime/modularize-dotnet.post.js
new file mode 100644
index 00000000000000..3dd689f441b962
--- /dev/null
+++ b/src/mono/wasm/runtime/modularize-dotnet.post.js
@@ -0,0 +1,10 @@
+
+Object.defineProperty(Module, '__esModule', { value: true });
+}());
+
+if (typeof exports === 'object' && typeof module === 'object')
+    module.exports = Module;
+else if (typeof define === 'function' && define['amd'])
+    define([], function () { return Module; });
+else if (typeof exports === 'object')
+    exports["Module"] = Module;
diff --git a/src/mono/wasm/runtime/modularize-dotnet.pre.js b/src/mono/wasm/runtime/modularize-dotnet.pre.js
new file mode 100644
index 00000000000000..5d11b9790454f7
--- /dev/null
+++ b/src/mono/wasm/runtime/modularize-dotnet.pre.js
@@ -0,0 +1 @@
+(function () {
diff --git a/src/mono/wasm/runtime/startup.ts b/src/mono/wasm/runtime/startup.ts
index 821b197e9f8b21..89aadb7108b4c9 100644
--- a/src/mono/wasm/runtime/startup.ts
+++ b/src/mono/wasm/runtime/startup.ts
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 import { INTERNAL, Module, runtimeHelpers } from "./modules";
-import { AssetEntry, CharPtr, CharPtrNull, Int32Ptr, MonoConfig, MonoString, MonoStringNull, TypedArray, VoidPtr, wasm_type_symbol } from "./types";
+import { AssetEntry, CharPtr, CharPtrNull, MonoConfig, TypedArray, VoidPtr, wasm_type_symbol } from "./types";
 import cwraps from "./cwraps";
 import { mono_wasm_raise_debug_event, mono_wasm_runtime_ready } from "./debug";
 import { mono_wasm_globalization_init, mono_wasm_load_icu_data } from "./icu";
@@ -10,82 +10,6 @@ import { toBase64StringImpl } from "./base64";
 import { mono_wasm_init_aot_profiler, mono_wasm_init_coverage_profiler } from "./profiler";
 import { mono_wasm_load_bytes_into_heap } from "./buffers";
 import { bind_runtime_method, get_method, _create_primitive_converters } from "./method-binding";
-import { conv_string } from "./strings";
-
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export function mono_wasm_invoke_js_blazor(exceptionMessage: Int32Ptr, callInfo: any, arg0: any, arg1: any, arg2: any): void | number {
-    try {
-        const blazorExports = (<any>globalThis).Blazor;
-        if (!blazorExports) {
-            throw new Error("The blazor.webassembly.js library is not loaded.");
-        }
-
-        return blazorExports._internal.invokeJSFromDotNet(callInfo, arg0, arg1, arg2);
-    } catch (ex: any) {
-        const exceptionJsString = ex.message + "\n" + ex.stack;
-        const exceptionSystemString = cwraps.mono_wasm_string_from_js(exceptionJsString);
-        Module.setValue(exceptionMessage, <any>exceptionSystemString, "i32"); // *exceptionMessage = exceptionSystemString;
-        return 0;
-    }
-}
-
-// This is for back-compat only and will eventually be removed
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export function mono_wasm_invoke_js_marshalled(exceptionMessage: Int32Ptr, asyncHandleLongPtr: number, functionName: MonoString, argsJson: MonoString, treatResultAsVoid: boolean): MonoString {
-    try {
-        // Passing a .NET long into JS via Emscripten is tricky. The method here is to pass
-        // as pointer to the long, then combine two reads from the HEAPU32 array.
-        // Even though JS numbers can't represent the full range of a .NET long, it's OK
-        // because we'll never exceed Number.MAX_SAFE_INTEGER (2^53 - 1) in this case.
-        //var u32Index = $1 >> 2;
-        const u32Index = asyncHandleLongPtr >> 2;
-        const asyncHandleJsNumber = Module.HEAPU32[u32Index + 1] * 4294967296 + Module.HEAPU32[u32Index];
-
-        // var funcNameJsString = UTF8ToString (functionName);
-        // var argsJsonJsString = argsJson && UTF8ToString (argsJson);
-        const funcNameJsString = conv_string(functionName);
-        const argsJsonJsString = argsJson && conv_string(argsJson);
-
-        const dotNetExports = (<any>globalThis).DotNet;
-        if (!dotNetExports) {
-            throw new Error("The Microsoft.JSInterop.js library is not loaded.");
-        }
-
-        if (asyncHandleJsNumber) {
-            dotNetExports.jsCallDispatcher.beginInvokeJSFromDotNet(asyncHandleJsNumber, funcNameJsString, argsJsonJsString, treatResultAsVoid);
-            return MonoStringNull;
-        } else {
-            const resultJson = dotNetExports.jsCallDispatcher.invokeJSFromDotNet(funcNameJsString, argsJsonJsString, treatResultAsVoid);
-            return resultJson === null ? MonoStringNull : cwraps.mono_wasm_string_from_js(resultJson);
-        }
-    } catch (ex: any) {
-        const exceptionJsString = ex.message + "\n" + ex.stack;
-        const exceptionSystemString = cwraps.mono_wasm_string_from_js(exceptionJsString);
-        Module.setValue(exceptionMessage, <any>exceptionSystemString, "i32"); // *exceptionMessage = exceptionSystemString;
-        return MonoStringNull;
-    }
-}
-
-// This is for back-compat only and will eventually be removed
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export function mono_wasm_invoke_js_unmarshalled(exceptionMessage: Int32Ptr, funcName: MonoString, arg0: any, arg1: any, arg2: any): void | number {
-    try {
-        // Get the function you're trying to invoke
-        const funcNameJsString = conv_string(funcName);
-        const dotNetExports = (<any>globalThis).DotNet;
-        if (!dotNetExports) {
-            throw new Error("The Microsoft.JSInterop.js library is not loaded.");
-        }
-        const funcInstance = dotNetExports.jsCallDispatcher.findJSFunction(funcNameJsString);
-
-        return funcInstance.call(null, arg0, arg1, arg2);
-    } catch (ex: any) {
-        const exceptionJsString = ex.message + "\n" + ex.stack;
-        const exceptionSystemString = cwraps.mono_wasm_string_from_js(exceptionJsString);
-        Module.setValue(exceptionMessage, <any>exceptionSystemString, "i32"); // *exceptionMessage = exceptionSystemString;
-        return 0;
-    }
-}
 
 // Set environment variable NAME to VALUE
 // Should be called before mono_load_runtime_and_bcl () in most cases
@@ -595,10 +519,10 @@ export async function mono_wasm_load_config(configFilePath: string): Promise<voi
             config = JSON.parse(read(configFilePath)); // read is a v8 debugger command
         }
         runtimeHelpers.config = config;
-    } catch (e) {
+    } catch (exc) {
         const errMessage = "failed to load config file " + configFilePath;
-        console.error(errMessage);
-        runtimeHelpers.config = { message: errMessage, error: e };
+        console.error(errMessage, exc);
+        runtimeHelpers.config = { message: errMessage, error: exc };
     } finally {
         Module.removeRunDependency(configFilePath);
     }
diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj
index 1f85febd2f9dd6..b7500a1ea28f4f 100644
--- a/src/mono/wasm/wasm.proj
+++ b/src/mono/wasm/wasm.proj
@@ -66,7 +66,7 @@
       <_EmccCommonFlags Include="-s ALLOW_MEMORY_GROWTH=1" />
       <_EmccCommonFlags Include="-s NO_EXIT_RUNTIME=1" />
       <_EmccCommonFlags Include="-s FORCE_FILESYSTEM=1" />
-      <_EmccCommonFlags Include="-s EXPORTED_RUNTIME_METHODS=&quot;['print','ccall','cwrap','setValue','getValue','UTF8ToString','UTF8ArrayToString','FS_createPath','FS_createDataFile','removeRunDependency','addRunDependency']&quot;" />
+      <_EmccCommonFlags Include="-s EXPORTED_RUNTIME_METHODS=&quot;['DOTNET','MONO','BINDING','INTERNAL','FS','print','ccall','cwrap','setValue','getValue','UTF8ToString','UTF8ArrayToString','FS_createPath','FS_createDataFile','removeRunDependency','addRunDependency']&quot;" />
       <_EmccCommonFlags Include="-s EXPORTED_FUNCTIONS=&quot;['_free','_malloc']&quot;" />
       <_EmccCommonFlags Include="--source-map-base http://example.com" />
 
@@ -182,6 +182,8 @@
                        runtime/pinvoke.c;
                        runtime/corebindings.c;
                        runtime/library-dotnet.js;
+                       runtime/modularize-dotnet.pre.js;
+                       runtime/modularize-dotnet.post.js;
                        $(SystemNativeDir)\pal_random.js;"
           DestinationFolder="$(NativeBinDir)src"
           SkipUnchangedFiles="true" />
diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/index.html b/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/index.html
index 7832e37351d5b7..61e61c409a9024 100644
--- a/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/index.html
+++ b/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/index.html
@@ -36,7 +36,7 @@ <h3 id="header">Wasm Browser Sample</h3>
 
       var App = {
         init: function () {
-          var exit_code = INTERNAL.call_static_method("[WebAssembly.Browser.HotReload.Test] Sample.Test:TestMeaning", []);
+          var exit_code = Module.INTERNAL.call_static_method("[WebAssembly.Browser.HotReload.Test] Sample.Test:TestMeaning", []);
           document.getElementById("out").innerHTML = exit_code;
 
           if (is_testing)
diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/runtime.js b/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/runtime.js
index c7b852edd52a66..4648ddd829e3ff 100644
--- a/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/runtime.js
+++ b/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/runtime.js
@@ -2,21 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 var Module = {
-
+    no_global_exports: true,
     config: null,
 
     preInit: async function () {
-        await MONO.mono_wasm_load_config("./mono-config.json"); // sets MONO.config implicitly
+        await Module.MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.MONO.config implicitly
     },
 
     onRuntimeInitialized: function () {
-        if (!MONO.config || MONO.config.error) {
+        if (!Module.MONO.config || Module.MONO.config.error) {
             console.log("No config found");
             test_exit(1);
-            throw (MONO.config.error);
+            throw (Module.MONO.config.error);
         }
 
-        MONO.config.loaded_cb = function () {
+        Module.MONO.config.loaded_cb = function () {
             try {
                 App.init();
             } catch (error) {
@@ -24,20 +24,20 @@ var Module = {
                 throw (error);
             }
         };
-        MONO.config.fetch_file_cb = function (asset) {
+        Module.MONO.config.fetch_file_cb = function (asset) {
             return fetch(asset, { credentials: 'same-origin' });
         }
 
-        if (MONO.config.environment_variables !== undefined) {
-            console.log("expected environment variables to be undefined, but they're: ", MONO.config.environment_variables);
+        if (Module.MONO.config.environment_variables !== undefined) {
+            console.log("expected environment variables to be undefined, but they're: ", Module.MONO.config.environment_variables);
             test_exit(1);
         }
-        MONO.config.environment_variables = {
+        Module.MONO.config.environment_variables = {
             "DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
         };
 
         try {
-            MONO.mono_load_runtime_and_bcl_args(MONO.config);
+            Module.MONO.mono_load_runtime_and_bcl_args(Module.MONO.config);
         } catch (error) {
             test_exit(1);
             throw (error);
diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/RuntimeConfig/index.html b/src/tests/FunctionalTests/WebAssembly/Browser/RuntimeConfig/index.html
index 2b618eaf31cbd3..a8f8f9e973ae4b 100644
--- a/src/tests/FunctionalTests/WebAssembly/Browser/RuntimeConfig/index.html
+++ b/src/tests/FunctionalTests/WebAssembly/Browser/RuntimeConfig/index.html
@@ -36,7 +36,7 @@ <h3 id="header">Wasm Browser Sample</h3>
 
       var App = {
         init: function () {
-          var exit_code = INTERNAL.call_static_method("[WebAssembly.Browser.RuntimeConfig.Test] Sample.Test:TestMeaning", []);
+          var exit_code = Module.INTERNAL.call_static_method("[WebAssembly.Browser.RuntimeConfig.Test] Sample.Test:TestMeaning", []);
           document.getElementById("out").innerHTML = exit_code;
 
           if (is_testing)
diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/RuntimeConfig/runtime.js b/src/tests/FunctionalTests/WebAssembly/Browser/RuntimeConfig/runtime.js
index f0a0dfead40520..0118db28513a9b 100644
--- a/src/tests/FunctionalTests/WebAssembly/Browser/RuntimeConfig/runtime.js
+++ b/src/tests/FunctionalTests/WebAssembly/Browser/RuntimeConfig/runtime.js
@@ -2,21 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 var Module = {
-
+    no_global_exports: true,
     config: null,
 
     preInit: async function () {
-        await MONO.mono_wasm_load_config("./mono-config.json"); // sets MONO.config implicitly
+        await Module.MONO.mono_wasm_load_config("./mono-config.json"); // sets Module.MONO.config implicitly
     },
 
     onRuntimeInitialized: function () {
-        if (!MONO.config || MONO.config.error) {
+        if (!Module.MONO.config || Module.MONO.config.error) {
             console.log("No config found");
             test_exit(1);
-            throw (MONO.config.error);
+            throw (Module.MONO.config.error);
         }
 
-        MONO.config.loaded_cb = function () {
+        Module.MONO.config.loaded_cb = function () {
             try {
                 App.init();
             } catch (error) {
@@ -24,12 +24,12 @@ var Module = {
                 throw (error);
             }
         };
-        MONO.config.fetch_file_cb = function (asset) {
+        Module.MONO.config.fetch_file_cb = function (asset) {
             return fetch(asset, { credentials: 'same-origin' });
         }
 
         try {
-            MONO.mono_load_runtime_and_bcl_args(MONO.config);
+            Module.MONO.mono_load_runtime_and_bcl_args(Module.MONO.config);
         } catch (error) {
             test_exit(1);
             throw (error);