.

terminus-terminal/src/api.ts

@@ -1,4 +1,4 @@
-import { TerminalTabComponent } from './components/terminalTab'
+import { TerminalTabComponent } from './components/terminalTab.component'
 export { TerminalTabComponent }
 
 export abstract class TerminalDecorator {

terminus-terminal/src/buttonProvider.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core'
 import { HotkeysService, ToolbarButtonProvider, IToolbarButton, AppService, ConfigService } from 'terminus-core'
 
-import { SessionsService } from './services/sessions'
-import { TerminalTabComponent } from './components/terminalTab'
+import { SessionsService } from './services/sessions.service'
+import { TerminalTabComponent } from './components/terminalTab.component'
 
 
 @Injectable()

terminus-terminal/src/components/colorPicker.component.ts

@@ -4,8 +4,8 @@ import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
     selector: 'color-picker',
-    template: require('./colorPicker.pug'),
-    styles: [require('./colorPicker.scss')],
+    template: require('./colorPicker.component.pug'),
+    styles: [require('./colorPicker.component.scss')],
 })
 export class ColorPickerComponent {
     @Input() model: string

terminus-terminal/src/components/terminalSettingsTab.component.ts

@@ -13,8 +13,8 @@ import { TerminalColorSchemeProvider, ITerminalColorScheme } from '../api'
 
 
 @Component({
-    template: require('./terminalSettingsTab.pug'),
-    styles: [require('./terminalSettingsTab.scss')],
+    template: require('./terminalSettingsTab.component.pug'),
+    styles: [require('./terminalSettingsTab.component.scss')],
 })
 export class TerminalSettingsTabComponent {
     fonts: string[] = []

terminus-terminal/src/components/terminalTab.component.ts

@@ -2,15 +2,16 @@ import { BehaviorSubject, ReplaySubject, Subject, Subscription } from 'rxjs'
 import { Component, NgZone, Inject, ViewChild, HostBinding, Input } from '@angular/core'
 import { AppService, ConfigService, BaseTabComponent } from 'terminus-core'
 
+import { Session } from '../services/sessions.service'
+
 import { TerminalDecorator, ResizeEvent } from '../api'
-import { Session } from '../services/sessions'
 import { hterm, preferenceManager } from '../hterm'
 
 
 @Component({
   selector: 'terminalTab',
   template: '<div #content class="content"></div>',
-  styles: [require('./terminalTab.scss')],
+  styles: [require('./terminalTab.component.scss')],
 })
 export class TerminalTabComponent extends BaseTabComponent {
     hterm: any

terminus-terminal/src/hterm.ts

@@ -18,7 +18,7 @@ hterm.hterm.VT.ESC['k'] = function(parseState) {
 }
 
 preferenceManager.set('user-css', dataurl.convert({
-    data: require('./components/terminal.userCSS.scss'),
+    data: require('./hterm.userCSS.scss'),
     mimetype: 'text/css',
     charset: 'utf8',
 }))

terminus-terminal/src/index.ts

@@ -6,10 +6,12 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { HostAppService, Platform, ToolbarButtonProvider, TabRecoveryProvider, ConfigProvider, HotkeysService } from 'terminus-core'
 import { SettingsTabProvider } from 'terminus-settings'
 
-import { TerminalTabComponent } from './components/terminalTab'
-import { TerminalSettingsTabComponent } from './components/terminalSettingsTab'
-import { ColorPickerComponent } from './components/colorPicker'
-import { SessionsService } from './services/sessions'
+import { TerminalTabComponent } from './components/terminalTab.component'
+import { TerminalSettingsTabComponent } from './components/terminalSettingsTab.component'
+import { ColorPickerComponent } from './components/colorPicker.component'
+
+import { SessionsService } from './services/sessions.service'
+
 import { ScreenPersistenceProvider } from './persistenceProviders'
 import { ButtonProvider } from './buttonProvider'
 import { RecoveryProvider } from './recoveryProvider'

terminus-terminal/src/recoveryProvider.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core'
 import { TabRecoveryProvider, AppService } from 'terminus-core'
 
-import { SessionsService } from './services/sessions'
-import { TerminalTabComponent } from './components/terminalTab'
+import { TerminalTabComponent } from './components/terminalTab.component'
+import { SessionsService } from './services/sessions.service'
 
 
 @Injectable()

terminus-terminal/src/settings.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { SettingsTabProvider, ComponentType } from 'terminus-settings'
 
-import { TerminalSettingsTabComponent } from './components/terminalSettingsTab'
+import { TerminalSettingsTabComponent } from './components/terminalSettingsTab.component'
 
 
 @Injectable()