diff --git a/src/Microsoft.Blazor.Browser.JS/src/GlobalExports.ts b/src/Microsoft.Blazor.Browser.JS/src/GlobalExports.ts
index 2f49ae5e06..c25ac06b4d 100644
--- a/src/Microsoft.Blazor.Browser.JS/src/GlobalExports.ts
+++ b/src/Microsoft.Blazor.Browser.JS/src/GlobalExports.ts
@@ -1,5 +1,5 @@
 import { platform } from './Environment'
-import { registerFunction } from './RegisteredFunction';
+import { registerFunction } from './Interop/RegisteredFunction';
 
 if (typeof window !== 'undefined') {
   // When the library is loaded in a browser via a <script> element, make the
diff --git a/src/Microsoft.Blazor.Browser.JS/src/InternalRegisteredFunction.ts b/src/Microsoft.Blazor.Browser.JS/src/Interop/InternalRegisteredFunction.ts
similarity index 64%
rename from src/Microsoft.Blazor.Browser.JS/src/InternalRegisteredFunction.ts
rename to src/Microsoft.Blazor.Browser.JS/src/Interop/InternalRegisteredFunction.ts
index 84f59f68bb..fa1a98f69d 100644
--- a/src/Microsoft.Blazor.Browser.JS/src/InternalRegisteredFunction.ts
+++ b/src/Microsoft.Blazor.Browser.JS/src/Interop/InternalRegisteredFunction.ts
@@ -1,5 +1,5 @@
-import { invokeWithJsonMarshalling } from './RegisteredFunction';
-import { attachComponentToElement, renderRenderTree } from './Rendering/Renderer';
+import { invokeWithJsonMarshalling } from './InvokeWithJsonMarshalling';
+import { attachComponentToElement, renderRenderTree } from '../Rendering/Renderer';
 
 /**
  * The definitive list of internal functions invokable from .NET code.
diff --git a/src/Microsoft.Blazor.Browser.JS/src/Interop/InvokeWithJsonMarshalling.ts b/src/Microsoft.Blazor.Browser.JS/src/Interop/InvokeWithJsonMarshalling.ts
new file mode 100644
index 0000000000..f98c4b22a8
--- /dev/null
+++ b/src/Microsoft.Blazor.Browser.JS/src/Interop/InvokeWithJsonMarshalling.ts
@@ -0,0 +1,16 @@
+import { platform } from '../Environment';
+import { System_String } from '../Platform/Platform';
+import { getRegisteredFunction } from './RegisteredFunction';
+
+export function invokeWithJsonMarshalling(identifier: System_String, ...argsJson: System_String[]) {
+  const identifierJsString = platform.toJavaScriptString(identifier);
+  const funcInstance = getRegisteredFunction(identifierJsString);
+  const args = argsJson.map(json => JSON.parse(platform.toJavaScriptString(json)));
+  const result = funcInstance.apply(null, args);
+  if (result !== null && result !== undefined) {
+    const resultJson = JSON.stringify(result);
+    return platform.toDotNetString(resultJson);
+  } else {
+    return null;
+  }
+}
diff --git a/src/Microsoft.Blazor.Browser.JS/src/RegisteredFunction.ts b/src/Microsoft.Blazor.Browser.JS/src/Interop/RegisteredFunction.ts
similarity index 56%
rename from src/Microsoft.Blazor.Browser.JS/src/RegisteredFunction.ts
rename to src/Microsoft.Blazor.Browser.JS/src/Interop/RegisteredFunction.ts
index 2d8da71e20..b923cbd315 100644
--- a/src/Microsoft.Blazor.Browser.JS/src/RegisteredFunction.ts
+++ b/src/Microsoft.Blazor.Browser.JS/src/Interop/RegisteredFunction.ts
@@ -1,6 +1,4 @@
-import { System_String } from './Platform/Platform';
-import { platform } from './Environment';
-import { internalRegisteredFunctions } from './InternalRegisteredFunction';
+import { internalRegisteredFunctions } from './InternalRegisteredFunction';
 
 const registeredFunctions: { [identifier: string]: Function | undefined } = {};
 
@@ -25,16 +23,3 @@ export function getRegisteredFunction(identifier: string): Function {
     throw new Error(`Could not find registered function with name '${identifier}'.`);
   }
 }
-
-export function invokeWithJsonMarshalling(identifier: System_String, ...argsJson: System_String[]) {
-  const identifierJsString = platform.toJavaScriptString(identifier);
-  const funcInstance = getRegisteredFunction(identifierJsString);
-  const args = argsJson.map(json => JSON.parse(platform.toJavaScriptString(json)));
-  const result = funcInstance.apply(null, args);
-  if (result !== null && result !== undefined) {
-    const resultJson = JSON.stringify(result);
-    return platform.toDotNetString(resultJson);
-  } else {
-    return null;
-  }
-}
diff --git a/src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts b/src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts
index 28f536d6c3..c710e606c1 100644
--- a/src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts
+++ b/src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts
@@ -1,6 +1,6 @@
 import { MethodHandle, System_Object, System_String, System_Array, Pointer, Platform } from '../Platform';
 import { getAssemblyNameFromUrl } from '../DotNet';
-import { getRegisteredFunction } from '../../RegisteredFunction';
+import { getRegisteredFunction } from '../../Interop/RegisteredFunction';
 
 let assembly_load: (assemblyName: string) => number;
 let find_class: (assemblyHandle: number, namespace: string, className: string) => number;