diff --git a/src/services/ExtensionController.ts b/src/controllers/ExtensionController.ts
similarity index 97%
rename from src/services/ExtensionController.ts
rename to src/controllers/ExtensionController.ts
index 5f2c2fbd..bbe485e9 100644
--- a/src/services/ExtensionController.ts
+++ b/src/controllers/ExtensionController.ts
@@ -21,12 +21,13 @@ import {
   Toaster,
   updateConnectionStatusBarItem,
 } from '../util';
-import { RunCommandCodeLensProvider } from './RunCommandCodeLensProvider';
-import { DhServiceRegistry } from './DhServiceRegistry';
-import { DhService } from './DhService';
-import { DhcService } from './DhcService';
-import { Config } from './Config';
-
+import {
+  Config,
+  DhServiceRegistry,
+  DhService,
+  DhcService,
+  RunCommandCodeLensProvider,
+} from '../services';
 const logger = new Logger('ExtensionController');
 
 export class ExtensionController implements Disposable {
diff --git a/src/controllers/index.ts b/src/controllers/index.ts
new file mode 100644
index 00000000..212c42c0
--- /dev/null
+++ b/src/controllers/index.ts
@@ -0,0 +1 @@
+export * from './ExtensionController';
diff --git a/src/extension.ts b/src/extension.ts
index 4f8aece0..34be1c24 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -1,5 +1,5 @@
 import * as vscode from 'vscode';
-import { ExtensionController } from './services';
+import { ExtensionController } from './controllers';
 
 export function activate(context: vscode.ExtensionContext): void {
   const controller = new ExtensionController(context);
diff --git a/src/services/index.ts b/src/services/index.ts
index a28afda3..bd03c0d1 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -3,5 +3,4 @@ export * from './Config';
 export * from './DhService';
 export * from './DhcService';
 export * from './DhServiceRegistry';
-export * from './ExtensionController';
 export * from './RunCommandCodeLensProvider';