diff --git a/luciexpress/htdocs/plugins/hello_world/hello_world.html b/luciexpress/htdocs/plugins/hello_world/hello_world.html
deleted file mode 100644
index 7b88fd96d..000000000
--- a/luciexpress/htdocs/plugins/hello_world/hello_world.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>{{msg}}</p>
diff --git a/luciexpress/htdocs/plugins/hello_world/hello_world.js b/luciexpress/htdocs/plugins/hello_world/hello_world.js
deleted file mode 100644
index 2780b4d97..000000000
--- a/luciexpress/htdocs/plugins/hello_world/hello_world.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * juci - javascript universal client interface
- *
- * Project Author: Martin K. Schröder <mkschreder.uk@gmail.com>
- * 
- * Copyright (C) 2012-2013 Inteno Broadband Technology AB. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
- 
-angular.module("hello_world", []).controller("HelloWorldCtrl", function($state){
-	$state.msg = "Hello World!"; 
-}); 
diff --git a/luciexpress/htdocs/plugins/hello_world/plugin.json b/luciexpress/htdocs/plugins/hello_world/plugin.json
deleted file mode 100644
index b832d1756..000000000
--- a/luciexpress/htdocs/plugins/hello_world/plugin.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"scripts": ["hello_world"]
-}
-
diff --git a/luciexpress/htdocs/plugins/hello_world/submodule.js b/luciexpress/htdocs/plugins/hello_world/submodule.js
deleted file mode 100644
index 2078b9f7c..000000000
--- a/luciexpress/htdocs/plugins/hello_world/submodule.js
+++ /dev/null
@@ -1 +0,0 @@
-console.log("Submodule!"); 
diff --git a/luciexpress/htdocs/plugins/router/pages/internet.firewall.html b/luciexpress/htdocs/plugins/router/pages/internet.firewall.html
index 4382931a3..8665d2e5d 100644
--- a/luciexpress/htdocs/plugins/router/pages/internet.firewall.html
+++ b/luciexpress/htdocs/plugins/router/pages/internet.firewall.html
@@ -1,7 +1,7 @@
 <luci-layout-with-sidebar>
 	<div ng-controller="InternetFirewallPageCtrl">
-		<h2>Firewall settings</h3>
-		<p>Your EasyBox provides extensive firewall functionality which protects against common attacks. Vodafone recommends not to turn off firewall.</p>
+		<h2 translate>Firewall settings</h3>
+		<p translate>Your EasyBox provides extensive firewall functionality which protects against common attacks. Vodafone recommends not to turn off firewall.</p>
 		<table class="table">
 			<tr>
 				<td>
diff --git a/luciexpress/htdocs/plugins/router/plugin.json b/luciexpress/htdocs/plugins/router/plugin.json
index add7a917b..626c6bf0d 100644
--- a/luciexpress/htdocs/plugins/router/plugin.json
+++ b/luciexpress/htdocs/plugins/router/plugin.json
@@ -14,51 +14,6 @@
 		},
 		"internet.port_mapping": {
 			"view": "pages/internet.port_mapping"
-		},
-		"settings.configuration": {
-			"view": "pages/settings.configuration"
-		},
-		"settings.energy": {
-			"view": "pages/settings.energy"
-		},
-		"settings.network": {
-			"view": "pages/settings.network"
-		},
-		"settings.password": {
-			"view": "pages/settings.password"
-		},
-		"settings.upgrade": {
-			"view": "pages/settings.upgrade"
-		},
-		"settings.uci": {
-			"view": "pages/settings.uci"
-		},
-		"status.status": {
-			"view": "pages/status.status"
-		},
-		"status.status.dsl": {
-			"view": "pages/status.status.dsl"
-		},
-		"status.status.tv": {
-			"view": "pages/status.status.tv"
-		},
-		"status.status.voice": {
-			"view": "pages/status.status.voice"
-		},
-		"status.about": {
-			"view": "pages/status.about"
-		},
-		"status.diagnostics": {
-			"view": "pages/status.diagnostics"
-		},
-		"status.events": {
-			"view": "pages/status.events"
-		},
-		"status.nat": {
-			"view": "pages/status.nat"
-		},
-		"status.restart": {
-			"view": "pages/status.restart"
 		}
 	}
 }
diff --git a/luciexpress/htdocs/plugins/router/router.js b/luciexpress/htdocs/plugins/router/router.js
index 5e3532e56..db0c549f7 100644
--- a/luciexpress/htdocs/plugins/router/router.js
+++ b/luciexpress/htdocs/plugins/router/router.js
@@ -31,16 +31,4 @@ $juci.module("router")
 	onEnter: function($state){
 		$juci.redirect("internet.firewall"); 
 	},
-})
-.state("settings", {
-	url: "/settings", 
-	onEnter: function($state){
-		$juci.redirect("settings.password"); 
-	},
-})
-.state("status", {
-	url: "/status", 
-	onEnter: function($state){
-		$juci.redirect("status.status"); 
-	},
-}); 
+});
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.configuration.html b/luciexpress/htdocs/plugins/settings/pages/settings.configuration.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.configuration.html
rename to luciexpress/htdocs/plugins/settings/pages/settings.configuration.html
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.configuration.js b/luciexpress/htdocs/plugins/settings/pages/settings.configuration.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.configuration.js
rename to luciexpress/htdocs/plugins/settings/pages/settings.configuration.js
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.energy.html b/luciexpress/htdocs/plugins/settings/pages/settings.energy.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.energy.html
rename to luciexpress/htdocs/plugins/settings/pages/settings.energy.html
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.energy.js b/luciexpress/htdocs/plugins/settings/pages/settings.energy.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.energy.js
rename to luciexpress/htdocs/plugins/settings/pages/settings.energy.js
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.network.html b/luciexpress/htdocs/plugins/settings/pages/settings.network.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.network.html
rename to luciexpress/htdocs/plugins/settings/pages/settings.network.html
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.network.js b/luciexpress/htdocs/plugins/settings/pages/settings.network.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.network.js
rename to luciexpress/htdocs/plugins/settings/pages/settings.network.js
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.password.html b/luciexpress/htdocs/plugins/settings/pages/settings.password.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.password.html
rename to luciexpress/htdocs/plugins/settings/pages/settings.password.html
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.password.js b/luciexpress/htdocs/plugins/settings/pages/settings.password.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.password.js
rename to luciexpress/htdocs/plugins/settings/pages/settings.password.js
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.uci.html b/luciexpress/htdocs/plugins/settings/pages/settings.uci.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.uci.html
rename to luciexpress/htdocs/plugins/settings/pages/settings.uci.html
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.uci.js b/luciexpress/htdocs/plugins/settings/pages/settings.uci.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.uci.js
rename to luciexpress/htdocs/plugins/settings/pages/settings.uci.js
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.upgrade.html b/luciexpress/htdocs/plugins/settings/pages/settings.upgrade.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.upgrade.html
rename to luciexpress/htdocs/plugins/settings/pages/settings.upgrade.html
diff --git a/luciexpress/htdocs/plugins/router/pages/settings.upgrade.js b/luciexpress/htdocs/plugins/settings/pages/settings.upgrade.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/settings.upgrade.js
rename to luciexpress/htdocs/plugins/settings/pages/settings.upgrade.js
diff --git a/luciexpress/htdocs/plugins/settings/plugin.json b/luciexpress/htdocs/plugins/settings/plugin.json
new file mode 100644
index 000000000..640688c37
--- /dev/null
+++ b/luciexpress/htdocs/plugins/settings/plugin.json
@@ -0,0 +1,25 @@
+{
+	"scripts": [
+		"settings"
+	],
+	"pages": {
+		"settings.configuration": {
+			"view": "pages/settings.configuration"
+		},
+		"settings.energy": {
+			"view": "pages/settings.energy"
+		},
+		"settings.network": {
+			"view": "pages/settings.network"
+		},
+		"settings.password": {
+			"view": "pages/settings.password"
+		},
+		"settings.upgrade": {
+			"view": "pages/settings.upgrade"
+		},
+		"settings.uci": {
+			"view": "pages/settings.uci"
+		}
+	}
+}
diff --git a/luciexpress/htdocs/plugins/settings/settings.js b/luciexpress/htdocs/plugins/settings/settings.js
new file mode 100644
index 000000000..67340057e
--- /dev/null
+++ b/luciexpress/htdocs/plugins/settings/settings.js
@@ -0,0 +1,7 @@
+$juci.module("settings")
+.state("settings", {
+	url: "/settings", 
+	onEnter: function($state){
+		$juci.redirect("settings.password"); 
+	},
+});
diff --git a/luciexpress/htdocs/plugins/router/pages/status.about.html b/luciexpress/htdocs/plugins/status/pages/status.about.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.about.html
rename to luciexpress/htdocs/plugins/status/pages/status.about.html
diff --git a/luciexpress/htdocs/plugins/router/pages/status.about.js b/luciexpress/htdocs/plugins/status/pages/status.about.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.about.js
rename to luciexpress/htdocs/plugins/status/pages/status.about.js
diff --git a/luciexpress/htdocs/plugins/router/pages/status.diagnostics.html b/luciexpress/htdocs/plugins/status/pages/status.diagnostics.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.diagnostics.html
rename to luciexpress/htdocs/plugins/status/pages/status.diagnostics.html
diff --git a/luciexpress/htdocs/plugins/router/pages/status.diagnostics.js b/luciexpress/htdocs/plugins/status/pages/status.diagnostics.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.diagnostics.js
rename to luciexpress/htdocs/plugins/status/pages/status.diagnostics.js
diff --git a/luciexpress/htdocs/plugins/router/pages/status.events.html b/luciexpress/htdocs/plugins/status/pages/status.events.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.events.html
rename to luciexpress/htdocs/plugins/status/pages/status.events.html
diff --git a/luciexpress/htdocs/plugins/router/pages/status.events.js b/luciexpress/htdocs/plugins/status/pages/status.events.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.events.js
rename to luciexpress/htdocs/plugins/status/pages/status.events.js
diff --git a/luciexpress/htdocs/plugins/router/pages/status.nat.html b/luciexpress/htdocs/plugins/status/pages/status.nat.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.nat.html
rename to luciexpress/htdocs/plugins/status/pages/status.nat.html
diff --git a/luciexpress/htdocs/plugins/router/pages/status.nat.js b/luciexpress/htdocs/plugins/status/pages/status.nat.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.nat.js
rename to luciexpress/htdocs/plugins/status/pages/status.nat.js
diff --git a/luciexpress/htdocs/plugins/router/pages/status.restart.html b/luciexpress/htdocs/plugins/status/pages/status.restart.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.restart.html
rename to luciexpress/htdocs/plugins/status/pages/status.restart.html
diff --git a/luciexpress/htdocs/plugins/router/pages/status.restart.js b/luciexpress/htdocs/plugins/status/pages/status.restart.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.restart.js
rename to luciexpress/htdocs/plugins/status/pages/status.restart.js
diff --git a/luciexpress/htdocs/plugins/router/pages/status.status.dsl.html b/luciexpress/htdocs/plugins/status/pages/status.status.dsl.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.status.dsl.html
rename to luciexpress/htdocs/plugins/status/pages/status.status.dsl.html
diff --git a/luciexpress/htdocs/plugins/router/pages/status.status.dsl.js b/luciexpress/htdocs/plugins/status/pages/status.status.dsl.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.status.dsl.js
rename to luciexpress/htdocs/plugins/status/pages/status.status.dsl.js
diff --git a/luciexpress/htdocs/plugins/router/pages/status.status.html b/luciexpress/htdocs/plugins/status/pages/status.status.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.status.html
rename to luciexpress/htdocs/plugins/status/pages/status.status.html
diff --git a/luciexpress/htdocs/plugins/router/pages/status.status.js b/luciexpress/htdocs/plugins/status/pages/status.status.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.status.js
rename to luciexpress/htdocs/plugins/status/pages/status.status.js
diff --git a/luciexpress/htdocs/plugins/router/pages/status.status.tv.html b/luciexpress/htdocs/plugins/status/pages/status.status.tv.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.status.tv.html
rename to luciexpress/htdocs/plugins/status/pages/status.status.tv.html
diff --git a/luciexpress/htdocs/plugins/router/pages/status.status.tv.js b/luciexpress/htdocs/plugins/status/pages/status.status.tv.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.status.tv.js
rename to luciexpress/htdocs/plugins/status/pages/status.status.tv.js
diff --git a/luciexpress/htdocs/plugins/router/pages/status.status.voice.html b/luciexpress/htdocs/plugins/status/pages/status.status.voice.html
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.status.voice.html
rename to luciexpress/htdocs/plugins/status/pages/status.status.voice.html
diff --git a/luciexpress/htdocs/plugins/router/pages/status.status.voice.js b/luciexpress/htdocs/plugins/status/pages/status.status.voice.js
similarity index 100%
rename from luciexpress/htdocs/plugins/router/pages/status.status.voice.js
rename to luciexpress/htdocs/plugins/status/pages/status.status.voice.js
diff --git a/luciexpress/htdocs/plugins/status/plugin.json b/luciexpress/htdocs/plugins/status/plugin.json
new file mode 100644
index 000000000..38d9014c2
--- /dev/null
+++ b/luciexpress/htdocs/plugins/status/plugin.json
@@ -0,0 +1,34 @@
+{
+	"scripts": [
+		"status"
+	],
+	"pages": {
+		"status.status": {
+			"view": "pages/status.status"
+		},
+		"status.status.dsl": {
+			"view": "pages/status.status.dsl"
+		},
+		"status.status.tv": {
+			"view": "pages/status.status.tv"
+		},
+		"status.status.voice": {
+			"view": "pages/status.status.voice"
+		},
+		"status.about": {
+			"view": "pages/status.about"
+		},
+		"status.diagnostics": {
+			"view": "pages/status.diagnostics"
+		},
+		"status.events": {
+			"view": "pages/status.events"
+		},
+		"status.nat": {
+			"view": "pages/status.nat"
+		},
+		"status.restart": {
+			"view": "pages/status.restart"
+		}
+	}
+}
diff --git a/luciexpress/htdocs/plugins/status/status.js b/luciexpress/htdocs/plugins/status/status.js
new file mode 100644
index 000000000..9a14cd43b
--- /dev/null
+++ b/luciexpress/htdocs/plugins/status/status.js
@@ -0,0 +1,7 @@
+$juci.module("status")
+.state("status", {
+	url: "/status", 
+	onEnter: function($state){
+		$juci.redirect("status.status"); 
+	},
+});