diff --git a/terminus-terminal/src/debug.ts b/terminus-terminal/src/features/debug.ts
similarity index 94%
rename from terminus-terminal/src/debug.ts
rename to terminus-terminal/src/features/debug.ts
index 0d630e30..9a6e177c 100644
--- a/terminus-terminal/src/debug.ts
+++ b/terminus-terminal/src/features/debug.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs'
 import { Injectable } from '@angular/core'
-import { TerminalDecorator } from './api/decorator'
-import { TerminalTabComponent } from './components/terminalTab.component'
+import { TerminalDecorator } from '../api/decorator'
+import { TerminalTabComponent } from '../components/terminalTab.component'
 import { ElectronService, HostAppService } from 'terminus-core'
 
 /** @hidden */
diff --git a/terminus-terminal/src/pathDrop.ts b/terminus-terminal/src/features/pathDrop.ts
similarity index 89%
rename from terminus-terminal/src/pathDrop.ts
rename to terminus-terminal/src/features/pathDrop.ts
index 19a19cf6..0c8415c2 100644
--- a/terminus-terminal/src/pathDrop.ts
+++ b/terminus-terminal/src/features/pathDrop.ts
@@ -1,7 +1,7 @@
 import { Subscription } from 'rxjs'
 import { Injectable } from '@angular/core'
-import { TerminalDecorator } from './api/decorator'
-import { TerminalTabComponent } from './components/terminalTab.component'
+import { TerminalDecorator } from '../api/decorator'
+import { TerminalTabComponent } from '../components/terminalTab.component'
 
 /** @hidden */
 @Injectable()
diff --git a/terminus-terminal/src/zmodem.ts b/terminus-terminal/src/features/zmodem.ts
similarity index 97%
rename from terminus-terminal/src/zmodem.ts
rename to terminus-terminal/src/features/zmodem.ts
index c4547ca6..5490f98a 100644
--- a/terminus-terminal/src/zmodem.ts
+++ b/terminus-terminal/src/features/zmodem.ts
@@ -4,8 +4,8 @@ import * as fs from 'fs'
 import * as path from 'path'
 import { Subscription } from 'rxjs'
 import { Injectable } from '@angular/core'
-import { TerminalDecorator } from './api/decorator'
-import { TerminalTabComponent } from './components/terminalTab.component'
+import { TerminalDecorator } from '../api/decorator'
+import { TerminalTabComponent } from '../components/terminalTab.component'
 import { LogService, Logger, ElectronService, HostAppService } from 'terminus-core'
 
 const SPACER = '            '
diff --git a/terminus-terminal/src/index.ts b/terminus-terminal/src/index.ts
index 33430a27..6af1a801 100644
--- a/terminus-terminal/src/index.ts
+++ b/terminus-terminal/src/index.ts
@@ -31,13 +31,13 @@ import { TerminalContextMenuItemProvider } from './api/contextMenuProvider'
 import { TerminalColorSchemeProvider } from './api/colorSchemeProvider'
 import { ShellProvider } from './api/shellProvider'
 import { TerminalSettingsTabProvider, AppearanceSettingsTabProvider, ShellSettingsTabProvider } from './settings'
-import { DebugDecorator } from './debug'
-import { PathDropDecorator } from './pathDrop'
+import { DebugDecorator } from './features/debug'
+import { PathDropDecorator } from './features/pathDrop'
+import { ZModemDecorator } from './features/zmodem'
 import { TerminalConfigProvider } from './config'
 import { TerminalHotkeyProvider } from './hotkeys'
 import { HyperColorSchemes } from './colorSchemes'
 import { NewTabContextMenu, CopyPasteContextMenu, SaveAsProfileContextMenu, LegacyContextMenu } from './tabContextMenu'
-import { ZModemDecorator } from './zmodem'
 
 import { CmderShellProvider } from './shells/cmder'
 import { CustomShellProvider } from './shells/custom'