diff --git a/icon.png b/img/icon.png
similarity index 100%
rename from icon.png
rename to img/icon.png
diff --git a/template.html b/index.html
similarity index 100%
rename from template.html
rename to index.html
diff --git a/background.js b/js/background.js
similarity index 100%
rename from background.js
rename to js/background.js
diff --git a/content.js b/js/content.js
similarity index 94%
rename from content.js
rename to js/content.js
index bb09f71..bedbe2d 100644
--- a/content.js
+++ b/js/content.js
@@ -4,7 +4,7 @@ function block() {
 
   // Synchronously replace document content with blocking template.
   var request = new XMLHttpRequest();
-  request.open("GET", chrome.extension.getURL('template.html'), false);
+  request.open("GET", chrome.extension.getURL("index.html"), false);
   request.send();
 
   if (request.status === 200) {
diff --git a/options.js b/js/options.js
similarity index 100%
rename from options.js
rename to js/options.js
diff --git a/underscore-1.8.3.min.js b/js/underscore-1.8.3.min.js
similarity index 100%
rename from underscore-1.8.3.min.js
rename to js/underscore-1.8.3.min.js
diff --git a/waitblock.js b/js/waitblock.js
similarity index 100%
rename from waitblock.js
rename to js/waitblock.js
diff --git a/manifest.json b/manifest.json
index 290a9f1..ab49c22 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,21 +8,24 @@
   "permissions": [
     "storage"
   ],
-  "icons": { "128": "icon.png" },
+  "icons": { "128": "img/icon.png" },
   "web_accessible_resources": [
-    "template.html"
+    "index.html"
   ],
   "background": {
     "scripts": [
-      "underscore-1.8.3.min.js",
-      "waitblock.js",
-      "background.js"
+      "js/underscore-1.8.3.min.js",
+      "js/waitblock.js",
+      "js/background.js"
     ]
   },
   "content_scripts": [
     {
       "matches": ["<all_urls>"],
-      "js": ["waitblock.js", "content.js"],
+      "js": [
+        "js/waitblock.js",
+        "js/content.js"
+      ],
       "run_at": "document_start"
     }
   ],
diff --git a/options.html b/options.html
index 324d744..0c29416 100644
--- a/options.html
+++ b/options.html
@@ -71,7 +71,7 @@
       </div>
     </section>
 
-    <script type="text/javascript" src="waitblock.js"></script>
-    <script type="text/javascript" src="options.js"></script>
+    <script type="text/javascript" src="js/waitblock.js"></script>
+    <script type="text/javascript" src="js/options.js"></script>
   </body>
 </html>