10 files changed, 30 insertions, 30 deletions
diff --git a/test/actions/console.test.js b/test/console/actions/console.test.js
index ff905bc..dd04c85 100644
--- a/test/actions/console.test.js
+++ b/test/console/actions/console.test.js
@@ -1,6 +1,6 @@
 import { expect } from "chai";
-import actions from 'actions';
-import * as consoleActions from 'actions/console';
+import actions from 'console/actions';
+import * as consoleActions from 'console/actions/console';
 
 describe("console actions", () => {
   describe("showCommand", () => {
diff --git a/test/reducers/console.test.js b/test/console/reducers/console.test.js
index 5ebf4bc..95ac993 100644
--- a/test/reducers/console.test.js
+++ b/test/console/reducers/console.test.js
@@ -1,10 +1,10 @@
 import { expect } from "chai";
-import actions from 'actions';
-import consoleReducer from 'reducers/console';
+import actions from 'console/actions';
+import reducer from 'console/reducers';
 
 describe("console reducer", () => {
   it('return the initial state', () => {
-    let state = consoleReducer(undefined, {});
+    let state = reducer(undefined, {});
     expect(state).to.have.property('errorShown', false);
     expect(state).to.have.property('errorText', '');
     expect(state).to.have.property('commandShown', false);
@@ -16,7 +16,7 @@ describe("console reducer", () => {
 
   it('return next state for CONSOLE_SHOW_COMMAND', () => {
     let action = { type: actions.CONSOLE_SHOW_COMMAND, text: 'open ' };
-    let state = consoleReducer({}, action);
+    let state = reducer({}, action);
     expect(state).to.have.property('commandShown', true);
     expect(state).to.have.property('commandText', 'open ');
     expect(state).to.have.property('errorShown', false);
@@ -24,7 +24,7 @@ describe("console reducer", () => {
 
   it('return next state for CONSOLE_SHOW_ERROR', () => {
     let action = { type: actions.CONSOLE_SHOW_ERROR, text: 'an error' };
-    let state = consoleReducer({}, action);
+    let state = reducer({}, action);
     expect(state).to.have.property('errorShown', true);
     expect(state).to.have.property('errorText', 'an error');
     expect(state).to.have.property('commandShown', false);
@@ -32,7 +32,7 @@ describe("console reducer", () => {
 
   it('return next state for CONSOLE_HIDE', () => {
     let action = { type: actions.CONSOLE_HIDE };
-    let state = consoleReducer({}, action);
+    let state = reducer({}, action);
     expect(state).to.have.property('errorShown', false);
     expect(state).to.have.property('commandShown', false);
   });
@@ -53,7 +53,7 @@ describe("console reducer", () => {
         items: [4, 5, 6]
       }]
     }
-    state = consoleReducer(state, action);
+    state = reducer(state, action);
     expect(state).to.have.property('completions', action.completions);
     expect(state).to.have.property('groupSelection', -1);
     expect(state).to.have.property('itemSelection', -1);
@@ -73,16 +73,16 @@ describe("console reducer", () => {
       }]
     };
 
-    state = consoleReducer(state, action);
+    state = reducer(state, action);
     expect(state).to.have.property('groupSelection', 0);
     expect(state).to.have.property('itemSelection', 0);
 
-    state = consoleReducer(state, action);
+    state = reducer(state, action);
     expect(state).to.have.property('groupSelection', 0);
     expect(state).to.have.property('itemSelection', 1);
 
-    state = consoleReducer(state, action);
-    state = consoleReducer(state, action);
+    state = reducer(state, action);
+    state = reducer(state, action);
     expect(state).to.have.property('groupSelection', -1);
     expect(state).to.have.property('itemSelection', -1);
   });
@@ -101,16 +101,16 @@ describe("console reducer", () => {
       }]
     };
 
-    state = consoleReducer(state, action);
+    state = reducer(state, action);
     expect(state).to.have.property('groupSelection', 1);
     expect(state).to.have.property('itemSelection', 0);
 
-    state = consoleReducer(state, action);
+    state = reducer(state, action);
     expect(state).to.have.property('groupSelection', 0);
     expect(state).to.have.property('itemSelection', 1);
 
-    state = consoleReducer(state, action);
-    state = consoleReducer(state, action);
+    state = reducer(state, action);
+    state = reducer(state, action);
     expect(state).to.have.property('groupSelection', -1);
     expect(state).to.have.property('itemSelection', -1);
   });
diff --git a/test/actions/follow.test.js b/test/content/actions/follow.test.js
index 32ab9e2..3ac844c 100644
--- a/test/actions/follow.test.js
+++ b/test/content/actions/follow.test.js
@@ -1,6 +1,6 @@
 import { expect } from "chai";
-import actions from 'actions';
-import * as followActions from 'actions/follow';
+import actions from 'content/actions';
+import * as followActions from 'content/actions/follow';
 
 describe('follow actions', () => {
   describe('enable', () => {
diff --git a/test/actions/input.test.js b/test/content/actions/input.test.js
index 0a2ab18..6031829 100644
--- a/test/actions/input.test.js
+++ b/test/content/actions/input.test.js
@@ -1,6 +1,6 @@
 import { expect } from "chai";
-import actions from 'actions';
-import * as inputActions from 'actions/input';
+import actions from 'content/actions';
+import * as inputActions from 'content/actions/input';
 
 describe("input actions", () => {
   describe("keyPress", () => {
diff --git a/test/components/follow.html b/test/content/components/follow.html
index 6bd8f87..6bd8f87 100644
--- a/test/components/follow.html
+++ b/test/content/components/follow.html
diff --git a/test/components/follow.test.js b/test/content/components/follow.test.js
index 294bfc9..9c00c79 100644
--- a/test/components/follow.test.js
+++ b/test/content/components/follow.test.js
@@ -1,10 +1,10 @@
 import { expect } from "chai";
-import FollowComponent from 'components/follow';
+import FollowComponent from 'content/components/follow';
 
 describe('FollowComponent', () => {
   describe('#getTargetElements', () => {
     beforeEach(() => {
-      document.body.innerHTML = __html__['test/components/follow.html'];
+      document.body.innerHTML = __html__['test/content/components/follow.html'];
     });
 
     it('returns visible links', () => {
diff --git a/test/reducers/follow.test.js b/test/content/reducers/follow.test.js
index e1db680..e2b3445 100644
--- a/test/reducers/follow.test.js
+++ b/test/content/reducers/follow.test.js
@@ -1,6 +1,6 @@
 import { expect } from "chai";
-import actions from 'actions';
-import followReducer from 'reducers/follow';
+import actions from 'content/actions';
+import followReducer from 'content/reducers/follow';
 
 describe('follow reducer', () => {
   it ('returns the initial state', () => {
diff --git a/test/reducers/input.test.js b/test/content/reducers/input.test.js
index 7b5a89c..d5e5f6b 100644
--- a/test/reducers/input.test.js
+++ b/test/content/reducers/input.test.js
@@ -1,6 +1,6 @@
 import { expect } from "chai";
-import actions from 'actions';
-import inputReducer from 'reducers/input';
+import actions from 'content/actions';
+import inputReducer from 'content/reducers/input';
 
 describe("input reducer", () => {
   it('return the initial state', () => {
diff --git a/test/reducers/setting.test.js b/test/settings/reducers/setting.test.js
index 1af031a..0e84247 100644
--- a/test/reducers/setting.test.js
+++ b/test/settings/reducers/setting.test.js
@@ -1,6 +1,6 @@
 import { expect } from "chai";
-import actions from 'actions';
-import settingReducer from 'reducers/setting';
+import actions from 'settings/actions';
+import settingReducer from 'settings/reducers/setting';
 
 describe("setting reducer", () => {
   it('return the initial state', () => {
diff --git a/test/store/index.test.js b/test/shared/store/index.test.js
index 5dce715..133033b 100644
--- a/test/store/index.test.js
+++ b/test/shared/store/index.test.js
@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import { createStore } from 'store';
+import { createStore } from 'shared/store';
 
 describe("Store class", () => {
   const reducer = (state, action) => {