diff --git a/src/createMetaMaskExternalExtensionProvider.ts b/src/extension-provider/createMetaMaskExternalExtensionProvider.ts
similarity index 93%
rename from src/createMetaMaskExternalExtensionProvider.ts
rename to src/extension-provider/createMetaMaskExternalExtensionProvider.ts
index c164fa82..d7f957b6 100644
--- a/src/createMetaMaskExternalExtensionProvider.ts
+++ b/src/extension-provider/createMetaMaskExternalExtensionProvider.ts
@@ -1,7 +1,7 @@
 import PortStream from 'extension-port-stream';
 import { detect } from 'detect-browser';
 import { Runtime } from 'webextension-polyfill-ts';
-import MetaMaskInpageProvider from './MetaMaskInpageProvider';
+import MetaMaskInpageProvider from '../MetaMaskInpageProvider';
 import config from './external-extension-config.json';
 
 const browser = detect();
diff --git a/src/external-extension-config.json b/src/extension-provider/external-extension-config.json
similarity index 100%
rename from src/external-extension-config.json
rename to src/extension-provider/external-extension-config.json
diff --git a/src/index.ts b/src/index.ts
index a6ad7bf7..2a076485 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,5 @@
 import MetaMaskInpageProvider from './MetaMaskInpageProvider';
-import createMetaMaskExternalExtensionProvider from './createMetaMaskExternalExtensionProvider';
+import createMetaMaskExternalExtensionProvider from './extension-provider/createMetaMaskExternalExtensionProvider';
 import BaseProvider from './BaseProvider';
 import {
   initializeProvider,