diff --git a/src/components/keymap/keymap.component.html b/src/components/keymap/edit/keymap-edit.component.html
similarity index 100%
rename from src/components/keymap/keymap.component.html
rename to src/components/keymap/edit/keymap-edit.component.html
diff --git a/src/components/keymap/keymap.component.scss b/src/components/keymap/edit/keymap-edit.component.scss
similarity index 100%
rename from src/components/keymap/keymap.component.scss
rename to src/components/keymap/edit/keymap-edit.component.scss
diff --git a/src/components/keymap/keymap.component.ts b/src/components/keymap/edit/keymap-edit.component.ts
similarity index 78%
rename from src/components/keymap/keymap.component.ts
rename to src/components/keymap/edit/keymap-edit.component.ts
index 231a13a9..20fcf4f1 100644
--- a/src/components/keymap/keymap.component.ts
+++ b/src/components/keymap/edit/keymap-edit.component.ts
@@ -10,14 +10,14 @@ import 'rxjs/add/operator/switchMap';
 import { Observable } from 'rxjs/Observable';
 import { ConnectableObservable } from 'rxjs/observable/ConnectableObservable';
 
-import { Keymap } from '../../config-serializer/config-items/Keymap';
-import { AppState } from '../../store';
-import { getKeymap } from '../../store/reducers/keymap';
+import { Keymap } from '../../../config-serializer/config-items/Keymap';
+import { AppState } from '../../../store';
+import { getKeymap } from '../../../store/reducers/keymap';
 
 @Component({
     selector: 'keymap',
-    template: require('./keymap.component.html'),
-    styles: [require('./keymap.component.scss')]
+    template: require('./keymap-edit.component.html'),
+    styles: [require('./keymap-edit.component.scss')]
 })
 export class KeymapComponent {
     private keymap$: Observable<Keymap>;
diff --git a/src/components/keymap/index.ts b/src/components/keymap/index.ts
index 8035bd43..8e041179 100644
--- a/src/components/keymap/index.ts
+++ b/src/components/keymap/index.ts
@@ -1,4 +1,4 @@
-export * from './keymap.component';
 export * from './keymap.routes';
 export * from './add/keymap-add.component';
+export * from './edit/keymap-edit.component';
 export * from './header/keymap-header.component';
diff --git a/src/components/keymap/keymap.routes.ts b/src/components/keymap/keymap.routes.ts
index dad0794d..57c40722 100644
--- a/src/components/keymap/keymap.routes.ts
+++ b/src/components/keymap/keymap.routes.ts
@@ -1,7 +1,7 @@
 import { Routes } from '@angular/router';
 
 import { KeymapAddComponent } from './add/keymap-add.component';
-import { KeymapComponent } from './keymap.component';
+import { KeymapComponent } from './edit/keymap-edit.component';
 
 export const keymapRoutes: Routes = [
     {