diff --git a/src/content/components/follow.js b/src/content/components/follow.js
index eb453a5..119a493 100644
--- a/src/content/components/follow.js
+++ b/src/content/components/follow.js
@@ -1,6 +1,6 @@
 import * as followActions from 'content/actions/follow';
 import messages from 'shared/messages';
-import Hint from 'content/hint';
+import Hint from './hint';
 import HintKeyProducer from 'content/hint-key-producer';
 
 const DEFAULT_HINT_CHARSET = 'abcdefghijklmnopqrstuvwxyz';
diff --git a/src/content/hint.css b/src/content/components/hint.css
similarity index 100%
rename from src/content/hint.css
rename to src/content/components/hint.css
diff --git a/src/content/hint.js b/src/content/components/hint.js
similarity index 100%
rename from src/content/hint.js
rename to src/content/components/hint.js
diff --git a/test/content/hint.html b/test/content/components/hint.html
similarity index 100%
rename from test/content/hint.html
rename to test/content/components/hint.html
diff --git a/test/content/hint.test.js b/test/content/components/hint.test.js
similarity index 92%
rename from test/content/hint.test.js
rename to test/content/components/hint.test.js
index 1547971..f98b79b 100644
--- a/test/content/hint.test.js
+++ b/test/content/components/hint.test.js
@@ -1,9 +1,9 @@
 import { expect } from "chai";
-import Hint from 'content/hint';
+import Hint from 'content/components/hint';
 
 describe('Hint class', () => {
   beforeEach(() => {
-    document.body.innerHTML = __html__['test/content/hint.html'];
+    document.body.innerHTML = __html__['test/content/components/hint.html'];
   });
 
   describe('#constructor', () => {