diff --git a/background.js b/background.js
index 790057a..3417e34 100644
--- a/background.js
+++ b/background.js
@@ -15,7 +15,7 @@ function initShellfoxProgram() {
 
 			browser.tabs.create({
 				"active": true,
-				"url": "/error.html",
+				"url": "/html/error.html",
 				"openerTabId": openerTab
 			})
 		});
diff --git a/error.html b/html/error.html
similarity index 100%
rename from error.html
rename to html/error.html
diff --git a/error.js b/html/error.js
similarity index 100%
rename from error.js
rename to html/error.js
diff --git a/options.html b/html/options.html
similarity index 100%
rename from options.html
rename to html/options.html
diff --git a/options.js b/html/options.js
similarity index 100%
rename from options.js
rename to html/options.js
diff --git a/res/screenshot-youtube.png b/img/screenshot-youtube.png
similarity index 100%
rename from res/screenshot-youtube.png
rename to img/screenshot-youtube.png
diff --git a/res/shellfox-19.png b/img/shellfox-19.png
similarity index 100%
rename from res/shellfox-19.png
rename to img/shellfox-19.png
diff --git a/res/shellfox-38.png b/img/shellfox-38.png
similarity index 100%
rename from res/shellfox-38.png
rename to img/shellfox-38.png
diff --git a/res/shellfox-action-19.png b/img/shellfox-action-19.png
similarity index 100%
rename from res/shellfox-action-19.png
rename to img/shellfox-action-19.png
diff --git a/res/shellfox-action-38.png b/img/shellfox-action-38.png
similarity index 100%
rename from res/shellfox-action-38.png
rename to img/shellfox-action-38.png
diff --git a/res/shellfox-action.png b/img/shellfox-action.png
similarity index 100%
rename from res/shellfox-action.png
rename to img/shellfox-action.png
diff --git a/res/shellfox.png b/img/shellfox.png
similarity index 100%
rename from res/shellfox.png
rename to img/shellfox.png
diff --git a/res/shellfox.txt b/img/shellfox.txt
similarity index 100%
rename from res/shellfox.txt
rename to img/shellfox.txt
diff --git a/res/shellfox.xcf b/img/shellfox.xcf
similarity index 100%
rename from res/shellfox.xcf
rename to img/shellfox.xcf
diff --git a/manifest.json b/manifest.json
index 73d1816..a1db1d4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,16 +9,16 @@
 	"default_locale": "en",
 
 	"icons": {
-		"250": "res/shellfox.png",
-		"38": "res/shellfox-38.png",
-		"19": "res/shellfox-19.png"
+		"250": "img/shellfox.png",
+		"38": "img/shellfox-38.png",
+		"19": "img/shellfox-19.png"
 	},
 
 	"page_action": {
 		"default_icon": {
-			"250": "res/shellfox-action.png",
-			"38": "res/shellfox-action-38.png",
-			"19": "res/shellfox-action-19.png"
+			"250": "img/shellfox-action.png",
+			"38": "img/shellfox-action-38.png",
+			"19": "img/shellfox-action-19.png"
 		},
 		"default_title": "__MSG_pageActionName__"
 	},
@@ -45,6 +45,6 @@
 	},
 
 	"options_ui": {
-		"page": "options.html"
+		"page": "html/options.html"
 	}
 }