diff --git a/installer/resources/themes/imagegen/imagegen.css b/apps/imagegen/imagegen/webapp/src/main/webapp/imagegen.css
similarity index 100%
rename from installer/resources/themes/imagegen/imagegen.css
rename to apps/imagegen/imagegen/webapp/src/main/webapp/imagegen.css
diff --git a/apps/imagegen/imagegen/webapp/src/main/webapp/index.html b/apps/imagegen/imagegen/webapp/src/main/webapp/index.html
index 00abd459ad483e50dce157a6b50e57e80b7fdea3..2bee3964987458f3d516ece3e568dfcd1d632425 100644
--- a/apps/imagegen/imagegen/webapp/src/main/webapp/index.html
+++ b/apps/imagegen/imagegen/webapp/src/main/webapp/index.html
@@ -6,7 +6,7 @@
<title>I2P Imagegen</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" href="/themes/console/light/images/favicon.ico">
- <link rel="stylesheet" href="/themes/imagegen/imagegen.css" type="text/css">
+ <link rel="stylesheet" href="imagegen.css" type="text/css">
</head>
<body>
diff --git a/installer/resources/themes/console/dark/console.css b/apps/routerconsole/jsp/themes/console/dark/console.css
similarity index 100%
rename from installer/resources/themes/console/dark/console.css
rename to apps/routerconsole/jsp/themes/console/dark/console.css
diff --git a/installer/resources/themes/console/dark/console_ar.css b/apps/routerconsole/jsp/themes/console/dark/console_ar.css
similarity index 100%
rename from installer/resources/themes/console/dark/console_ar.css
rename to apps/routerconsole/jsp/themes/console/dark/console_ar.css
diff --git a/installer/resources/themes/console/dark/console_big.css b/apps/routerconsole/jsp/themes/console/dark/console_big.css
similarity index 100%
rename from installer/resources/themes/console/dark/console_big.css
rename to apps/routerconsole/jsp/themes/console/dark/console_big.css
diff --git a/installer/resources/themes/console/dark/images/chart.png b/apps/routerconsole/jsp/themes/console/dark/images/chart.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/chart.png
rename to apps/routerconsole/jsp/themes/console/dark/images/chart.png
diff --git a/installer/resources/themes/console/dark/images/confirmed.png b/apps/routerconsole/jsp/themes/console/dark/images/confirmed.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/confirmed.png
rename to apps/routerconsole/jsp/themes/console/dark/images/confirmed.png
diff --git a/installer/resources/themes/console/dark/images/console_status_running.png b/apps/routerconsole/jsp/themes/console/dark/images/console_status_running.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/console_status_running.png
rename to apps/routerconsole/jsp/themes/console/dark/images/console_status_running.png
diff --git a/installer/resources/themes/console/dark/images/console_status_starting.png b/apps/routerconsole/jsp/themes/console/dark/images/console_status_starting.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/console_status_starting.png
rename to apps/routerconsole/jsp/themes/console/dark/images/console_status_starting.png
diff --git a/installer/resources/themes/console/dark/images/console_status_stopped.png b/apps/routerconsole/jsp/themes/console/dark/images/console_status_stopped.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/console_status_stopped.png
rename to apps/routerconsole/jsp/themes/console/dark/images/console_status_stopped.png
diff --git a/installer/resources/themes/console/dark/images/dropdown.png b/apps/routerconsole/jsp/themes/console/dark/images/dropdown.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/dropdown.png
rename to apps/routerconsole/jsp/themes/console/dark/images/dropdown.png
diff --git a/installer/resources/themes/console/dark/images/dropdown_active.png b/apps/routerconsole/jsp/themes/console/dark/images/dropdown_active.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/dropdown_active.png
rename to apps/routerconsole/jsp/themes/console/dark/images/dropdown_active.png
diff --git a/installer/resources/themes/console/dark/images/dropdown_hover.png b/apps/routerconsole/jsp/themes/console/dark/images/dropdown_hover.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/dropdown_hover.png
rename to apps/routerconsole/jsp/themes/console/dark/images/dropdown_hover.png
diff --git a/installer/resources/themes/console/dark/images/eye.png b/apps/routerconsole/jsp/themes/console/dark/images/eye.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/eye.png
rename to apps/routerconsole/jsp/themes/console/dark/images/eye.png
diff --git a/installer/resources/themes/console/dark/images/favicon.ico b/apps/routerconsole/jsp/themes/console/dark/images/favicon.ico
similarity index 100%
rename from installer/resources/themes/console/dark/images/favicon.ico
rename to apps/routerconsole/jsp/themes/console/dark/images/favicon.ico
diff --git a/installer/resources/themes/console/dark/images/header.png b/apps/routerconsole/jsp/themes/console/dark/images/header.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/header.png
rename to apps/routerconsole/jsp/themes/console/dark/images/header.png
diff --git a/installer/resources/themes/console/dark/images/help.png b/apps/routerconsole/jsp/themes/console/dark/images/help.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/help.png
rename to apps/routerconsole/jsp/themes/console/dark/images/help.png
diff --git a/installer/resources/themes/console/dark/images/i2plogo.png b/apps/routerconsole/jsp/themes/console/dark/images/i2plogo.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/i2plogo.png
rename to apps/routerconsole/jsp/themes/console/dark/images/i2plogo.png
diff --git a/installer/resources/themes/console/dark/images/infohelp.png b/apps/routerconsole/jsp/themes/console/dark/images/infohelp.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/infohelp.png
rename to apps/routerconsole/jsp/themes/console/dark/images/infohelp.png
diff --git a/installer/resources/themes/console/dark/images/infowarn.png b/apps/routerconsole/jsp/themes/console/dark/images/infowarn.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/infowarn.png
rename to apps/routerconsole/jsp/themes/console/dark/images/infowarn.png
diff --git a/installer/resources/themes/console/dark/images/link.png b/apps/routerconsole/jsp/themes/console/dark/images/link.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/link.png
rename to apps/routerconsole/jsp/themes/console/dark/images/link.png
diff --git a/installer/resources/themes/console/dark/images/magnet.png b/apps/routerconsole/jsp/themes/console/dark/images/magnet.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/magnet.png
rename to apps/routerconsole/jsp/themes/console/dark/images/magnet.png
diff --git a/installer/resources/themes/console/dark/images/move_bottom.png b/apps/routerconsole/jsp/themes/console/dark/images/move_bottom.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/move_bottom.png
rename to apps/routerconsole/jsp/themes/console/dark/images/move_bottom.png
diff --git a/installer/resources/themes/console/dark/images/move_down.png b/apps/routerconsole/jsp/themes/console/dark/images/move_down.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/move_down.png
rename to apps/routerconsole/jsp/themes/console/dark/images/move_down.png
diff --git a/installer/resources/themes/console/dark/images/move_top.png b/apps/routerconsole/jsp/themes/console/dark/images/move_top.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/move_top.png
rename to apps/routerconsole/jsp/themes/console/dark/images/move_top.png
diff --git a/installer/resources/themes/console/dark/images/move_up.png b/apps/routerconsole/jsp/themes/console/dark/images/move_up.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/move_up.png
rename to apps/routerconsole/jsp/themes/console/dark/images/move_up.png
diff --git a/installer/resources/themes/console/dark/images/news.png b/apps/routerconsole/jsp/themes/console/dark/images/news.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/news.png
rename to apps/routerconsole/jsp/themes/console/dark/images/news.png
diff --git a/installer/resources/themes/console/dark/images/newsbullet_mini.png b/apps/routerconsole/jsp/themes/console/dark/images/newsbullet_mini.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/newsbullet_mini.png
rename to apps/routerconsole/jsp/themes/console/dark/images/newsbullet_mini.png
diff --git a/installer/resources/themes/console/dark/images/newtab.png b/apps/routerconsole/jsp/themes/console/dark/images/newtab.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/newtab.png
rename to apps/routerconsole/jsp/themes/console/dark/images/newtab.png
diff --git a/installer/resources/themes/console/dark/images/sort_down.png b/apps/routerconsole/jsp/themes/console/dark/images/sort_down.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/sort_down.png
rename to apps/routerconsole/jsp/themes/console/dark/images/sort_down.png
diff --git a/installer/resources/themes/console/dark/images/sort_up.png b/apps/routerconsole/jsp/themes/console/dark/images/sort_up.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/sort_up.png
rename to apps/routerconsole/jsp/themes/console/dark/images/sort_up.png
diff --git a/installer/resources/themes/console/dark/images/thumbnail.png b/apps/routerconsole/jsp/themes/console/dark/images/thumbnail.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/thumbnail.png
rename to apps/routerconsole/jsp/themes/console/dark/images/thumbnail.png
diff --git a/installer/resources/themes/console/dark/images/warn.png b/apps/routerconsole/jsp/themes/console/dark/images/warn.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/warn.png
rename to apps/routerconsole/jsp/themes/console/dark/images/warn.png
diff --git a/installer/resources/themes/console/dark/images/warning.png b/apps/routerconsole/jsp/themes/console/dark/images/warning.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/warning.png
rename to apps/routerconsole/jsp/themes/console/dark/images/warning.png
diff --git a/installer/resources/themes/console/dark/images/warning24x24.png b/apps/routerconsole/jsp/themes/console/dark/images/warning24x24.png
similarity index 100%
rename from installer/resources/themes/console/dark/images/warning24x24.png
rename to apps/routerconsole/jsp/themes/console/dark/images/warning24x24.png
diff --git a/installer/resources/themes/console/dark/mobile.css b/apps/routerconsole/jsp/themes/console/dark/mobile.css
similarity index 100%
rename from installer/resources/themes/console/dark/mobile.css
rename to apps/routerconsole/jsp/themes/console/dark/mobile.css
diff --git a/installer/resources/themes/console/images/anoncoin_32.png b/apps/routerconsole/jsp/themes/console/images/anoncoin_32.png
similarity index 100%
rename from installer/resources/themes/console/images/anoncoin_32.png
rename to apps/routerconsole/jsp/themes/console/images/anoncoin_32.png
diff --git a/installer/resources/themes/console/images/billiard_marker.png b/apps/routerconsole/jsp/themes/console/images/billiard_marker.png
similarity index 100%
rename from installer/resources/themes/console/images/billiard_marker.png
rename to apps/routerconsole/jsp/themes/console/images/billiard_marker.png
diff --git a/installer/resources/themes/console/images/book_addresses.png b/apps/routerconsole/jsp/themes/console/images/book_addresses.png
similarity index 100%
rename from installer/resources/themes/console/images/book_addresses.png
rename to apps/routerconsole/jsp/themes/console/images/book_addresses.png
diff --git a/installer/resources/themes/console/images/box_open.png b/apps/routerconsole/jsp/themes/console/images/box_open.png
similarity index 100%
rename from installer/resources/themes/console/images/box_open.png
rename to apps/routerconsole/jsp/themes/console/images/box_open.png
diff --git a/installer/resources/themes/console/images/bug.png b/apps/routerconsole/jsp/themes/console/images/bug.png
similarity index 100%
rename from installer/resources/themes/console/images/bug.png
rename to apps/routerconsole/jsp/themes/console/images/bug.png
diff --git a/installer/resources/themes/console/images/buttons/Xstart.png b/apps/routerconsole/jsp/themes/console/images/buttons/Xstart.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/Xstart.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/Xstart.png
diff --git a/installer/resources/themes/console/images/buttons/Xstop.png b/apps/routerconsole/jsp/themes/console/images/buttons/Xstop.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/Xstop.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/Xstop.png
diff --git a/installer/resources/themes/console/images/buttons/add.png b/apps/routerconsole/jsp/themes/console/images/buttons/add.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/add.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/add.png
diff --git a/installer/resources/themes/console/images/buttons/add_address.png b/apps/routerconsole/jsp/themes/console/images/buttons/add_address.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/add_address.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/add_address.png
diff --git a/installer/resources/themes/console/images/buttons/back.png b/apps/routerconsole/jsp/themes/console/images/buttons/back.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/back.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/back.png
diff --git a/installer/resources/themes/console/images/buttons/ban.png b/apps/routerconsole/jsp/themes/console/images/buttons/ban.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/ban.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/ban.png
diff --git a/installer/resources/themes/console/images/buttons/clean.png b/apps/routerconsole/jsp/themes/console/images/buttons/clean.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/clean.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/clean.png
diff --git a/installer/resources/themes/console/images/buttons/clean_hover.png b/apps/routerconsole/jsp/themes/console/images/buttons/clean_hover.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/clean_hover.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/clean_hover.png
diff --git a/installer/resources/themes/console/images/buttons/configure.png b/apps/routerconsole/jsp/themes/console/images/buttons/configure.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/configure.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/configure.png
diff --git a/installer/resources/themes/console/images/buttons/configure_hover.png b/apps/routerconsole/jsp/themes/console/images/buttons/configure_hover.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/configure_hover.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/configure_hover.png
diff --git a/installer/resources/themes/console/images/buttons/create-file.png b/apps/routerconsole/jsp/themes/console/images/buttons/create-file.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/create-file.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/create-file.png
diff --git a/installer/resources/themes/console/images/buttons/create.png b/apps/routerconsole/jsp/themes/console/images/buttons/create.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/create.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/create.png
diff --git a/installer/resources/themes/console/images/buttons/delete.png b/apps/routerconsole/jsp/themes/console/images/buttons/delete.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/delete.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/delete.png
diff --git a/installer/resources/themes/console/images/buttons/delete_hover.png b/apps/routerconsole/jsp/themes/console/images/buttons/delete_hover.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/delete_hover.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/delete_hover.png
diff --git a/installer/resources/themes/console/images/buttons/download.png b/apps/routerconsole/jsp/themes/console/images/buttons/download.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/download.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/download.png
diff --git a/installer/resources/themes/console/images/buttons/dump-threads.png b/apps/routerconsole/jsp/themes/console/images/buttons/dump-threads.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/dump-threads.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/dump-threads.png
diff --git a/installer/resources/themes/console/images/buttons/edit.png b/apps/routerconsole/jsp/themes/console/images/buttons/edit.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/edit.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/edit.png
diff --git a/installer/resources/themes/console/images/buttons/edit2.png b/apps/routerconsole/jsp/themes/console/images/buttons/edit2.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/edit2.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/edit2.png
diff --git a/installer/resources/themes/console/images/buttons/filter.png b/apps/routerconsole/jsp/themes/console/images/buttons/filter.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/filter.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/filter.png
diff --git a/installer/resources/themes/console/images/buttons/floodfill.png b/apps/routerconsole/jsp/themes/console/images/buttons/floodfill.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/floodfill.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/floodfill.png
diff --git a/installer/resources/themes/console/images/buttons/from-file.png b/apps/routerconsole/jsp/themes/console/images/buttons/from-file.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/from-file.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/from-file.png
diff --git a/installer/resources/themes/console/images/buttons/fullview.png b/apps/routerconsole/jsp/themes/console/images/buttons/fullview.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/fullview.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/fullview.png
diff --git a/installer/resources/themes/console/images/buttons/go.png b/apps/routerconsole/jsp/themes/console/images/buttons/go.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/go.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/go.png
diff --git a/installer/resources/themes/console/images/buttons/helper.png b/apps/routerconsole/jsp/themes/console/images/buttons/helper.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/helper.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/helper.png
diff --git a/installer/resources/themes/console/images/buttons/hide.png b/apps/routerconsole/jsp/themes/console/images/buttons/hide.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/hide.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/hide.png
diff --git a/installer/resources/themes/console/images/buttons/link.png b/apps/routerconsole/jsp/themes/console/images/buttons/link.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/link.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/link.png
diff --git a/installer/resources/themes/console/images/buttons/no.png b/apps/routerconsole/jsp/themes/console/images/buttons/no.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/no.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/no.png
diff --git a/installer/resources/themes/console/images/buttons/password.png b/apps/routerconsole/jsp/themes/console/images/buttons/password.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/password.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/password.png
diff --git a/installer/resources/themes/console/images/buttons/restart.png b/apps/routerconsole/jsp/themes/console/images/buttons/restart.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/restart.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/restart.png
diff --git a/installer/resources/themes/console/images/buttons/restart_hover.png b/apps/routerconsole/jsp/themes/console/images/buttons/restart_hover.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/restart_hover.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/restart_hover.png
diff --git a/installer/resources/themes/console/images/buttons/restore.png b/apps/routerconsole/jsp/themes/console/images/buttons/restore.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/restore.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/restore.png
diff --git a/installer/resources/themes/console/images/buttons/restore_hover.png b/apps/routerconsole/jsp/themes/console/images/buttons/restore_hover.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/restore_hover.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/restore_hover.png
diff --git a/installer/resources/themes/console/images/buttons/search.png b/apps/routerconsole/jsp/themes/console/images/buttons/search.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/search.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/search.png
diff --git a/installer/resources/themes/console/images/buttons/search_hover.png b/apps/routerconsole/jsp/themes/console/images/buttons/search_hover.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/search_hover.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/search_hover.png
diff --git a/installer/resources/themes/console/images/buttons/show.png b/apps/routerconsole/jsp/themes/console/images/buttons/show.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/show.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/show.png
diff --git a/installer/resources/themes/console/images/buttons/shutdown.png b/apps/routerconsole/jsp/themes/console/images/buttons/shutdown.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/shutdown.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/shutdown.png
diff --git a/installer/resources/themes/console/images/buttons/shutdown_hover.png b/apps/routerconsole/jsp/themes/console/images/buttons/shutdown_hover.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/shutdown_hover.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/shutdown_hover.png
diff --git a/installer/resources/themes/console/images/buttons/unban.png b/apps/routerconsole/jsp/themes/console/images/buttons/unban.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/unban.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/unban.png
diff --git a/installer/resources/themes/console/images/buttons/update.png b/apps/routerconsole/jsp/themes/console/images/buttons/update.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/update.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/update.png
diff --git a/installer/resources/themes/console/images/buttons/update_hover.png b/apps/routerconsole/jsp/themes/console/images/buttons/update_hover.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/update_hover.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/update_hover.png
diff --git a/installer/resources/themes/console/images/buttons/user.png b/apps/routerconsole/jsp/themes/console/images/buttons/user.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/user.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/user.png
diff --git a/installer/resources/themes/console/images/buttons/users.png b/apps/routerconsole/jsp/themes/console/images/buttons/users.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/users.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/users.png
diff --git a/installer/resources/themes/console/images/buttons/yes.png b/apps/routerconsole/jsp/themes/console/images/buttons/yes.png
similarity index 100%
rename from installer/resources/themes/console/images/buttons/yes.png
rename to apps/routerconsole/jsp/themes/console/images/buttons/yes.png
diff --git a/installer/resources/themes/console/images/chart_bar.png b/apps/routerconsole/jsp/themes/console/images/chart_bar.png
similarity index 100%
rename from installer/resources/themes/console/images/chart_bar.png
rename to apps/routerconsole/jsp/themes/console/images/chart_bar.png
diff --git a/installer/resources/themes/console/images/chart_line.png b/apps/routerconsole/jsp/themes/console/images/chart_line.png
similarity index 100%
rename from installer/resources/themes/console/images/chart_line.png
rename to apps/routerconsole/jsp/themes/console/images/chart_line.png
diff --git a/installer/resources/themes/console/images/client.png b/apps/routerconsole/jsp/themes/console/images/client.png
similarity index 100%
rename from installer/resources/themes/console/images/client.png
rename to apps/routerconsole/jsp/themes/console/images/client.png
diff --git a/installer/resources/themes/console/images/cursor_zoom.png b/apps/routerconsole/jsp/themes/console/images/cursor_zoom.png
similarity index 100%
rename from installer/resources/themes/console/images/cursor_zoom.png
rename to apps/routerconsole/jsp/themes/console/images/cursor_zoom.png
diff --git a/installer/resources/themes/console/images/echelon.png b/apps/routerconsole/jsp/themes/console/images/echelon.png
similarity index 100%
rename from installer/resources/themes/console/images/echelon.png
rename to apps/routerconsole/jsp/themes/console/images/echelon.png
diff --git a/installer/resources/themes/console/images/education.png b/apps/routerconsole/jsp/themes/console/images/education.png
similarity index 100%
rename from installer/resources/themes/console/images/education.png
rename to apps/routerconsole/jsp/themes/console/images/education.png
diff --git a/installer/resources/themes/console/images/eepsite.png b/apps/routerconsole/jsp/themes/console/images/eepsite.png
similarity index 100%
rename from installer/resources/themes/console/images/eepsite.png
rename to apps/routerconsole/jsp/themes/console/images/eepsite.png
diff --git a/installer/resources/themes/console/images/email.png b/apps/routerconsole/jsp/themes/console/images/email.png
similarity index 100%
rename from installer/resources/themes/console/images/email.png
rename to apps/routerconsole/jsp/themes/console/images/email.png
diff --git a/installer/resources/themes/console/images/errortriangle.png b/apps/routerconsole/jsp/themes/console/images/errortriangle.png
similarity index 100%
rename from installer/resources/themes/console/images/errortriangle.png
rename to apps/routerconsole/jsp/themes/console/images/errortriangle.png
diff --git a/installer/resources/themes/console/images/favicon.ico b/apps/routerconsole/jsp/themes/console/images/favicon.ico
similarity index 100%
rename from installer/resources/themes/console/images/favicon.ico
rename to apps/routerconsole/jsp/themes/console/images/favicon.ico
diff --git a/installer/resources/themes/console/images/folder.png b/apps/routerconsole/jsp/themes/console/images/folder.png
similarity index 100%
rename from installer/resources/themes/console/images/folder.png
rename to apps/routerconsole/jsp/themes/console/images/folder.png
diff --git a/installer/resources/themes/console/images/glass.png b/apps/routerconsole/jsp/themes/console/images/glass.png
similarity index 100%
rename from installer/resources/themes/console/images/glass.png
rename to apps/routerconsole/jsp/themes/console/images/glass.png
diff --git a/installer/resources/themes/console/images/group.png b/apps/routerconsole/jsp/themes/console/images/group.png
similarity index 100%
rename from installer/resources/themes/console/images/group.png
rename to apps/routerconsole/jsp/themes/console/images/group.png
diff --git a/installer/resources/themes/console/images/group_gear.png b/apps/routerconsole/jsp/themes/console/images/group_gear.png
similarity index 100%
rename from installer/resources/themes/console/images/group_gear.png
rename to apps/routerconsole/jsp/themes/console/images/group_gear.png
diff --git a/installer/resources/themes/console/images/i2pgit.png b/apps/routerconsole/jsp/themes/console/images/i2pgit.png
similarity index 100%
rename from installer/resources/themes/console/images/i2pgit.png
rename to apps/routerconsole/jsp/themes/console/images/i2pgit.png
diff --git a/installer/resources/themes/console/images/i2plogo.png b/apps/routerconsole/jsp/themes/console/images/i2plogo.png
similarity index 100%
rename from installer/resources/themes/console/images/i2plogo.png
rename to apps/routerconsole/jsp/themes/console/images/i2plogo.png
diff --git a/installer/resources/themes/console/images/i2psnark.png b/apps/routerconsole/jsp/themes/console/images/i2psnark.png
similarity index 100%
rename from installer/resources/themes/console/images/i2psnark.png
rename to apps/routerconsole/jsp/themes/console/images/i2psnark.png
diff --git a/installer/resources/themes/console/images/i2pwiki_logo.png b/apps/routerconsole/jsp/themes/console/images/i2pwiki_logo.png
similarity index 100%
rename from installer/resources/themes/console/images/i2pwiki_logo.png
rename to apps/routerconsole/jsp/themes/console/images/i2pwiki_logo.png
diff --git a/installer/resources/themes/console/images/inbound.png b/apps/routerconsole/jsp/themes/console/images/inbound.png
similarity index 100%
rename from installer/resources/themes/console/images/inbound.png
rename to apps/routerconsole/jsp/themes/console/images/inbound.png
diff --git a/installer/resources/themes/console/images/info/author.png b/apps/routerconsole/jsp/themes/console/images/info/author.png
similarity index 100%
rename from installer/resources/themes/console/images/info/author.png
rename to apps/routerconsole/jsp/themes/console/images/info/author.png
diff --git a/installer/resources/themes/console/images/info/author_dark.png b/apps/routerconsole/jsp/themes/console/images/info/author_dark.png
similarity index 100%
rename from installer/resources/themes/console/images/info/author_dark.png
rename to apps/routerconsole/jsp/themes/console/images/info/author_dark.png
diff --git a/installer/resources/themes/console/images/info/backlogged.png b/apps/routerconsole/jsp/themes/console/images/info/backlogged.png
similarity index 100%
rename from installer/resources/themes/console/images/info/backlogged.png
rename to apps/routerconsole/jsp/themes/console/images/info/backlogged.png
diff --git a/installer/resources/themes/console/images/info/bandwidth.png b/apps/routerconsole/jsp/themes/console/images/info/bandwidth.png
similarity index 100%
rename from installer/resources/themes/console/images/info/bandwidth.png
rename to apps/routerconsole/jsp/themes/console/images/info/bandwidth.png
diff --git a/installer/resources/themes/console/images/info/blocked.png b/apps/routerconsole/jsp/themes/console/images/info/blocked.png
similarity index 100%
rename from installer/resources/themes/console/images/info/blocked.png
rename to apps/routerconsole/jsp/themes/console/images/info/blocked.png
diff --git a/installer/resources/themes/console/images/info/box.png b/apps/routerconsole/jsp/themes/console/images/info/box.png
similarity index 100%
rename from installer/resources/themes/console/images/info/box.png
rename to apps/routerconsole/jsp/themes/console/images/info/box.png
diff --git a/installer/resources/themes/console/images/info/bugreport.png b/apps/routerconsole/jsp/themes/console/images/info/bugreport.png
similarity index 100%
rename from installer/resources/themes/console/images/info/bugreport.png
rename to apps/routerconsole/jsp/themes/console/images/info/bugreport.png
diff --git a/installer/resources/themes/console/images/info/client.png b/apps/routerconsole/jsp/themes/console/images/info/client.png
similarity index 100%
rename from installer/resources/themes/console/images/info/client.png
rename to apps/routerconsole/jsp/themes/console/images/info/client.png
diff --git a/installer/resources/themes/console/images/info/configure.png b/apps/routerconsole/jsp/themes/console/images/info/configure.png
similarity index 100%
rename from installer/resources/themes/console/images/info/configure.png
rename to apps/routerconsole/jsp/themes/console/images/info/configure.png
diff --git a/installer/resources/themes/console/images/info/connect.png b/apps/routerconsole/jsp/themes/console/images/info/connect.png
similarity index 100%
rename from installer/resources/themes/console/images/info/connect.png
rename to apps/routerconsole/jsp/themes/console/images/info/connect.png
diff --git a/installer/resources/themes/console/images/info/console.png b/apps/routerconsole/jsp/themes/console/images/info/console.png
similarity index 100%
rename from installer/resources/themes/console/images/info/console.png
rename to apps/routerconsole/jsp/themes/console/images/info/console.png
diff --git a/installer/resources/themes/console/images/info/control.png b/apps/routerconsole/jsp/themes/console/images/info/control.png
similarity index 100%
rename from installer/resources/themes/console/images/info/control.png
rename to apps/routerconsole/jsp/themes/console/images/info/control.png
diff --git a/installer/resources/themes/console/images/info/debug.png b/apps/routerconsole/jsp/themes/console/images/info/debug.png
similarity index 100%
rename from installer/resources/themes/console/images/info/debug.png
rename to apps/routerconsole/jsp/themes/console/images/info/debug.png
diff --git a/installer/resources/themes/console/images/info/errortriangle.png b/apps/routerconsole/jsp/themes/console/images/info/errortriangle.png
similarity index 100%
rename from installer/resources/themes/console/images/info/errortriangle.png
rename to apps/routerconsole/jsp/themes/console/images/info/errortriangle.png
diff --git a/installer/resources/themes/console/images/info/experimental.png b/apps/routerconsole/jsp/themes/console/images/info/experimental.png
similarity index 100%
rename from installer/resources/themes/console/images/info/experimental.png
rename to apps/routerconsole/jsp/themes/console/images/info/experimental.png
diff --git a/installer/resources/themes/console/images/info/export_key.png b/apps/routerconsole/jsp/themes/console/images/info/export_key.png
similarity index 100%
rename from installer/resources/themes/console/images/info/export_key.png
rename to apps/routerconsole/jsp/themes/console/images/info/export_key.png
diff --git a/installer/resources/themes/console/images/info/family.png b/apps/routerconsole/jsp/themes/console/images/info/family.png
similarity index 100%
rename from installer/resources/themes/console/images/info/family.png
rename to apps/routerconsole/jsp/themes/console/images/info/family.png
diff --git a/installer/resources/themes/console/images/info/floodfill_32x32.png b/apps/routerconsole/jsp/themes/console/images/info/floodfill_32x32.png
similarity index 100%
rename from installer/resources/themes/console/images/info/floodfill_32x32.png
rename to apps/routerconsole/jsp/themes/console/images/info/floodfill_32x32.png
diff --git a/installer/resources/themes/console/images/info/from_file.png b/apps/routerconsole/jsp/themes/console/images/info/from_file.png
similarity index 100%
rename from installer/resources/themes/console/images/info/from_file.png
rename to apps/routerconsole/jsp/themes/console/images/info/from_file.png
diff --git a/installer/resources/themes/console/images/info/home.png b/apps/routerconsole/jsp/themes/console/images/info/home.png
similarity index 100%
rename from installer/resources/themes/console/images/info/home.png
rename to apps/routerconsole/jsp/themes/console/images/info/home.png
diff --git a/installer/resources/themes/console/images/info/infohelp.png b/apps/routerconsole/jsp/themes/console/images/info/infohelp.png
similarity index 100%
rename from installer/resources/themes/console/images/info/infohelp.png
rename to apps/routerconsole/jsp/themes/console/images/info/infohelp.png
diff --git a/installer/resources/themes/console/images/info/infowarn.png b/apps/routerconsole/jsp/themes/console/images/info/infowarn.png
similarity index 100%
rename from installer/resources/themes/console/images/info/infowarn.png
rename to apps/routerconsole/jsp/themes/console/images/info/infowarn.png
diff --git a/installer/resources/themes/console/images/info/interval.png b/apps/routerconsole/jsp/themes/console/images/info/interval.png
similarity index 100%
rename from installer/resources/themes/console/images/info/interval.png
rename to apps/routerconsole/jsp/themes/console/images/info/interval.png
diff --git a/installer/resources/themes/console/images/info/java_edit.png b/apps/routerconsole/jsp/themes/console/images/info/java_edit.png
similarity index 100%
rename from installer/resources/themes/console/images/info/java_edit.png
rename to apps/routerconsole/jsp/themes/console/images/info/java_edit.png
diff --git a/installer/resources/themes/console/images/info/key.png b/apps/routerconsole/jsp/themes/console/images/info/key.png
similarity index 100%
rename from installer/resources/themes/console/images/info/key.png
rename to apps/routerconsole/jsp/themes/console/images/info/key.png
diff --git a/installer/resources/themes/console/images/info/keys.png b/apps/routerconsole/jsp/themes/console/images/info/keys.png
similarity index 100%
rename from installer/resources/themes/console/images/info/keys.png
rename to apps/routerconsole/jsp/themes/console/images/info/keys.png
diff --git a/installer/resources/themes/console/images/info/label.png b/apps/routerconsole/jsp/themes/console/images/info/label.png
similarity index 100%
rename from installer/resources/themes/console/images/info/label.png
rename to apps/routerconsole/jsp/themes/console/images/info/label.png
diff --git a/installer/resources/themes/console/images/info/launch_browser.png b/apps/routerconsole/jsp/themes/console/images/info/launch_browser.png
similarity index 100%
rename from installer/resources/themes/console/images/info/launch_browser.png
rename to apps/routerconsole/jsp/themes/console/images/info/launch_browser.png
diff --git a/installer/resources/themes/console/images/info/leave_family.png b/apps/routerconsole/jsp/themes/console/images/info/leave_family.png
similarity index 100%
rename from installer/resources/themes/console/images/info/leave_family.png
rename to apps/routerconsole/jsp/themes/console/images/info/leave_family.png
diff --git a/installer/resources/themes/console/images/info/logs.png b/apps/routerconsole/jsp/themes/console/images/info/logs.png
similarity index 100%
rename from installer/resources/themes/console/images/info/logs.png
rename to apps/routerconsole/jsp/themes/console/images/info/logs.png
diff --git a/installer/resources/themes/console/images/info/network_status/accepting.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/accepting.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/accepting.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/accepting.png
diff --git a/installer/resources/themes/console/images/info/network_status/network_clockskew.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/network_clockskew.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/network_clockskew.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/network_clockskew.png
diff --git a/installer/resources/themes/console/images/info/network_status/network_error.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/network_error.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/network_error.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/network_error.png
diff --git a/installer/resources/themes/console/images/info/network_status/network_firewalled.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/network_firewalled.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/network_firewalled.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/network_firewalled.png
diff --git a/installer/resources/themes/console/images/info/network_status/network_hidden.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/network_hidden.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/network_hidden.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/network_hidden.png
diff --git a/installer/resources/themes/console/images/info/network_status/network_ok.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/network_ok.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/network_ok.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/network_ok.png
diff --git a/installer/resources/themes/console/images/info/network_status/network_testing.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/network_testing.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/network_testing.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/network_testing.png
diff --git a/installer/resources/themes/console/images/info/network_status/network_vm.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/network_vm.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/network_vm.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/network_vm.png
diff --git a/installer/resources/themes/console/images/info/network_status/network_warning.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/network_warning.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/network_warning.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/network_warning.png
diff --git a/installer/resources/themes/console/images/info/network_status/rejecting.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/rejecting.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/rejecting.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/rejecting.png
diff --git a/installer/resources/themes/console/images/info/network_status/rejecting_hidden.png b/apps/routerconsole/jsp/themes/console/images/info/network_status/rejecting_hidden.png
similarity index 100%
rename from installer/resources/themes/console/images/info/network_status/rejecting_hidden.png
rename to apps/routerconsole/jsp/themes/console/images/info/network_status/rejecting_hidden.png
diff --git a/installer/resources/themes/console/images/info/newspaper.png b/apps/routerconsole/jsp/themes/console/images/info/newspaper.png
similarity index 100%
rename from installer/resources/themes/console/images/info/newspaper.png
rename to apps/routerconsole/jsp/themes/console/images/info/newspaper.png
diff --git a/installer/resources/themes/console/images/info/notice.png b/apps/routerconsole/jsp/themes/console/images/info/notice.png
similarity index 100%
rename from installer/resources/themes/console/images/info/notice.png
rename to apps/routerconsole/jsp/themes/console/images/info/notice.png
diff --git a/installer/resources/themes/console/images/info/plugin_edit.png b/apps/routerconsole/jsp/themes/console/images/info/plugin_edit.png
similarity index 100%
rename from installer/resources/themes/console/images/info/plugin_edit.png
rename to apps/routerconsole/jsp/themes/console/images/info/plugin_edit.png
diff --git a/installer/resources/themes/console/images/info/plugin_link.png b/apps/routerconsole/jsp/themes/console/images/info/plugin_link.png
similarity index 100%
rename from installer/resources/themes/console/images/info/plugin_link.png
rename to apps/routerconsole/jsp/themes/console/images/info/plugin_link.png
diff --git a/installer/resources/themes/console/images/info/power.png b/apps/routerconsole/jsp/themes/console/images/info/power.png
similarity index 100%
rename from installer/resources/themes/console/images/info/power.png
rename to apps/routerconsole/jsp/themes/console/images/info/power.png
diff --git a/installer/resources/themes/console/images/info/question.png b/apps/routerconsole/jsp/themes/console/images/info/question.png
similarity index 100%
rename from installer/resources/themes/console/images/info/question.png
rename to apps/routerconsole/jsp/themes/console/images/info/question.png
diff --git a/installer/resources/themes/console/images/info/reboot.png b/apps/routerconsole/jsp/themes/console/images/info/reboot.png
similarity index 100%
rename from installer/resources/themes/console/images/info/reboot.png
rename to apps/routerconsole/jsp/themes/console/images/info/reboot.png
diff --git a/installer/resources/themes/console/images/info/rosette.png b/apps/routerconsole/jsp/themes/console/images/info/rosette.png
similarity index 100%
rename from installer/resources/themes/console/images/info/rosette.png
rename to apps/routerconsole/jsp/themes/console/images/info/rosette.png
diff --git a/installer/resources/themes/console/images/info/server.png b/apps/routerconsole/jsp/themes/console/images/info/server.png
similarity index 100%
rename from installer/resources/themes/console/images/info/server.png
rename to apps/routerconsole/jsp/themes/console/images/info/server.png
diff --git a/installer/resources/themes/console/images/info/statistics.png b/apps/routerconsole/jsp/themes/console/images/info/statistics.png
similarity index 100%
rename from installer/resources/themes/console/images/info/statistics.png
rename to apps/routerconsole/jsp/themes/console/images/info/statistics.png
diff --git a/installer/resources/themes/console/images/info/systray.png b/apps/routerconsole/jsp/themes/console/images/info/systray.png
similarity index 100%
rename from installer/resources/themes/console/images/info/systray.png
rename to apps/routerconsole/jsp/themes/console/images/info/systray.png
diff --git a/installer/resources/themes/console/images/info/update.png b/apps/routerconsole/jsp/themes/console/images/info/update.png
similarity index 100%
rename from installer/resources/themes/console/images/info/update.png
rename to apps/routerconsole/jsp/themes/console/images/info/update.png
diff --git a/installer/resources/themes/console/images/info/url.png b/apps/routerconsole/jsp/themes/console/images/info/url.png
similarity index 100%
rename from installer/resources/themes/console/images/info/url.png
rename to apps/routerconsole/jsp/themes/console/images/info/url.png
diff --git a/installer/resources/themes/console/images/info/user_add.png b/apps/routerconsole/jsp/themes/console/images/info/user_add.png
similarity index 100%
rename from installer/resources/themes/console/images/info/user_add.png
rename to apps/routerconsole/jsp/themes/console/images/info/user_add.png
diff --git a/installer/resources/themes/console/images/info/wizard.png b/apps/routerconsole/jsp/themes/console/images/info/wizard.png
similarity index 100%
rename from installer/resources/themes/console/images/info/wizard.png
rename to apps/routerconsole/jsp/themes/console/images/info/wizard.png
diff --git a/installer/resources/themes/console/images/info_rhombus.png b/apps/routerconsole/jsp/themes/console/images/info_rhombus.png
similarity index 100%
rename from installer/resources/themes/console/images/info_rhombus.png
rename to apps/routerconsole/jsp/themes/console/images/info_rhombus.png
diff --git a/installer/resources/themes/console/images/itoopie_sm.png b/apps/routerconsole/jsp/themes/console/images/itoopie_sm.png
similarity index 100%
rename from installer/resources/themes/console/images/itoopie_sm.png
rename to apps/routerconsole/jsp/themes/console/images/itoopie_sm.png
diff --git a/installer/resources/themes/console/images/itoopie_xsm.png b/apps/routerconsole/jsp/themes/console/images/itoopie_xsm.png
similarity index 100%
rename from installer/resources/themes/console/images/itoopie_xsm.png
rename to apps/routerconsole/jsp/themes/console/images/itoopie_xsm.png
diff --git a/installer/resources/themes/console/images/local_down.png b/apps/routerconsole/jsp/themes/console/images/local_down.png
similarity index 100%
rename from installer/resources/themes/console/images/local_down.png
rename to apps/routerconsole/jsp/themes/console/images/local_down.png
diff --git a/installer/resources/themes/console/images/local_inprogress.png b/apps/routerconsole/jsp/themes/console/images/local_inprogress.png
similarity index 100%
rename from installer/resources/themes/console/images/local_inprogress.png
rename to apps/routerconsole/jsp/themes/console/images/local_inprogress.png
diff --git a/installer/resources/themes/console/images/local_up.png b/apps/routerconsole/jsp/themes/console/images/local_up.png
similarity index 100%
rename from installer/resources/themes/console/images/local_up.png
rename to apps/routerconsole/jsp/themes/console/images/local_up.png
diff --git a/installer/resources/themes/console/images/muwire.png b/apps/routerconsole/jsp/themes/console/images/muwire.png
similarity index 100%
rename from installer/resources/themes/console/images/muwire.png
rename to apps/routerconsole/jsp/themes/console/images/muwire.png
diff --git a/installer/resources/themes/console/images/outbound.png b/apps/routerconsole/jsp/themes/console/images/outbound.png
similarity index 100%
rename from installer/resources/themes/console/images/outbound.png
rename to apps/routerconsole/jsp/themes/console/images/outbound.png
diff --git a/installer/resources/themes/console/images/paste.png b/apps/routerconsole/jsp/themes/console/images/paste.png
similarity index 100%
rename from installer/resources/themes/console/images/paste.png
rename to apps/routerconsole/jsp/themes/console/images/paste.png
diff --git a/installer/resources/themes/console/images/paste_plain.png b/apps/routerconsole/jsp/themes/console/images/paste_plain.png
similarity index 100%
rename from installer/resources/themes/console/images/paste_plain.png
rename to apps/routerconsole/jsp/themes/console/images/paste_plain.png
diff --git a/installer/resources/themes/console/images/plugin.png b/apps/routerconsole/jsp/themes/console/images/plugin.png
similarity index 100%
rename from installer/resources/themes/console/images/plugin.png
rename to apps/routerconsole/jsp/themes/console/images/plugin.png
diff --git a/installer/resources/themes/console/images/question.png b/apps/routerconsole/jsp/themes/console/images/question.png
similarity index 100%
rename from installer/resources/themes/console/images/question.png
rename to apps/routerconsole/jsp/themes/console/images/question.png
diff --git a/installer/resources/themes/console/images/script_gear.png b/apps/routerconsole/jsp/themes/console/images/script_gear.png
similarity index 100%
rename from installer/resources/themes/console/images/script_gear.png
rename to apps/routerconsole/jsp/themes/console/images/script_gear.png
diff --git a/installer/resources/themes/console/images/server.png b/apps/routerconsole/jsp/themes/console/images/server.png
similarity index 100%
rename from installer/resources/themes/console/images/server.png
rename to apps/routerconsole/jsp/themes/console/images/server.png
diff --git a/installer/resources/themes/console/images/server_32x32.png b/apps/routerconsole/jsp/themes/console/images/server_32x32.png
similarity index 100%
rename from installer/resources/themes/console/images/server_32x32.png
rename to apps/routerconsole/jsp/themes/console/images/server_32x32.png
diff --git a/installer/resources/themes/console/images/support.png b/apps/routerconsole/jsp/themes/console/images/support.png
similarity index 100%
rename from installer/resources/themes/console/images/support.png
rename to apps/routerconsole/jsp/themes/console/images/support.png
diff --git a/installer/resources/themes/console/images/thetinhat.png b/apps/routerconsole/jsp/themes/console/images/thetinhat.png
similarity index 100%
rename from installer/resources/themes/console/images/thetinhat.png
rename to apps/routerconsole/jsp/themes/console/images/thetinhat.png
diff --git a/installer/resources/themes/console/images/title_window.png b/apps/routerconsole/jsp/themes/console/images/title_window.png
similarity index 100%
rename from installer/resources/themes/console/images/title_window.png
rename to apps/routerconsole/jsp/themes/console/images/title_window.png
diff --git a/installer/resources/themes/console/images/trac_wiki.png b/apps/routerconsole/jsp/themes/console/images/trac_wiki.png
similarity index 100%
rename from installer/resources/themes/console/images/trac_wiki.png
rename to apps/routerconsole/jsp/themes/console/images/trac_wiki.png
diff --git a/installer/resources/themes/console/images/transparent.gif b/apps/routerconsole/jsp/themes/console/images/transparent.gif
similarity index 100%
rename from installer/resources/themes/console/images/transparent.gif
rename to apps/routerconsole/jsp/themes/console/images/transparent.gif
diff --git a/installer/resources/themes/console/images/wizard/step-0.png b/apps/routerconsole/jsp/themes/console/images/wizard/step-0.png
similarity index 100%
rename from installer/resources/themes/console/images/wizard/step-0.png
rename to apps/routerconsole/jsp/themes/console/images/wizard/step-0.png
diff --git a/installer/resources/themes/console/images/wizard/step-1.png b/apps/routerconsole/jsp/themes/console/images/wizard/step-1.png
similarity index 100%
rename from installer/resources/themes/console/images/wizard/step-1.png
rename to apps/routerconsole/jsp/themes/console/images/wizard/step-1.png
diff --git a/installer/resources/themes/console/images/wizard/step-2.png b/apps/routerconsole/jsp/themes/console/images/wizard/step-2.png
similarity index 100%
rename from installer/resources/themes/console/images/wizard/step-2.png
rename to apps/routerconsole/jsp/themes/console/images/wizard/step-2.png
diff --git a/installer/resources/themes/console/images/wizard/step-3.png b/apps/routerconsole/jsp/themes/console/images/wizard/step-3.png
similarity index 100%
rename from installer/resources/themes/console/images/wizard/step-3.png
rename to apps/routerconsole/jsp/themes/console/images/wizard/step-3.png
diff --git a/installer/resources/themes/console/images/wizard/step-4.png b/apps/routerconsole/jsp/themes/console/images/wizard/step-4.png
similarity index 100%
rename from installer/resources/themes/console/images/wizard/step-4.png
rename to apps/routerconsole/jsp/themes/console/images/wizard/step-4.png
diff --git a/installer/resources/themes/console/images/wizard/step-5.png b/apps/routerconsole/jsp/themes/console/images/wizard/step-5.png
similarity index 100%
rename from installer/resources/themes/console/images/wizard/step-5.png
rename to apps/routerconsole/jsp/themes/console/images/wizard/step-5.png
diff --git a/installer/resources/themes/console/images/wizard/step-6.png b/apps/routerconsole/jsp/themes/console/images/wizard/step-6.png
similarity index 100%
rename from installer/resources/themes/console/images/wizard/step-6.png
rename to apps/routerconsole/jsp/themes/console/images/wizard/step-6.png
diff --git a/installer/resources/themes/console/images/wizard/wizardlogo.png b/apps/routerconsole/jsp/themes/console/images/wizard/wizardlogo.png
similarity index 100%
rename from installer/resources/themes/console/images/wizard/wizardlogo.png
rename to apps/routerconsole/jsp/themes/console/images/wizard/wizardlogo.png
diff --git a/installer/resources/themes/console/images/world.png b/apps/routerconsole/jsp/themes/console/images/world.png
similarity index 100%
rename from installer/resources/themes/console/images/world.png
rename to apps/routerconsole/jsp/themes/console/images/world.png
diff --git a/installer/resources/themes/console/light/console.css b/apps/routerconsole/jsp/themes/console/light/console.css
similarity index 100%
rename from installer/resources/themes/console/light/console.css
rename to apps/routerconsole/jsp/themes/console/light/console.css
diff --git a/installer/resources/themes/console/light/console_ar.css b/apps/routerconsole/jsp/themes/console/light/console_ar.css
similarity index 100%
rename from installer/resources/themes/console/light/console_ar.css
rename to apps/routerconsole/jsp/themes/console/light/console_ar.css
diff --git a/installer/resources/themes/console/light/console_big.css b/apps/routerconsole/jsp/themes/console/light/console_big.css
similarity index 100%
rename from installer/resources/themes/console/light/console_big.css
rename to apps/routerconsole/jsp/themes/console/light/console_big.css
diff --git a/installer/resources/themes/console/light/images/application.png b/apps/routerconsole/jsp/themes/console/light/images/application.png
similarity index 100%
rename from installer/resources/themes/console/light/images/application.png
rename to apps/routerconsole/jsp/themes/console/light/images/application.png
diff --git a/installer/resources/themes/console/light/images/confirmed.png b/apps/routerconsole/jsp/themes/console/light/images/confirmed.png
similarity index 100%
rename from installer/resources/themes/console/light/images/confirmed.png
rename to apps/routerconsole/jsp/themes/console/light/images/confirmed.png
diff --git a/installer/resources/themes/console/light/images/console_status_running.png b/apps/routerconsole/jsp/themes/console/light/images/console_status_running.png
similarity index 100%
rename from installer/resources/themes/console/light/images/console_status_running.png
rename to apps/routerconsole/jsp/themes/console/light/images/console_status_running.png
diff --git a/installer/resources/themes/console/light/images/console_status_starting.png b/apps/routerconsole/jsp/themes/console/light/images/console_status_starting.png
similarity index 100%
rename from installer/resources/themes/console/light/images/console_status_starting.png
rename to apps/routerconsole/jsp/themes/console/light/images/console_status_starting.png
diff --git a/installer/resources/themes/console/light/images/console_status_stopped.png b/apps/routerconsole/jsp/themes/console/light/images/console_status_stopped.png
similarity index 100%
rename from installer/resources/themes/console/light/images/console_status_stopped.png
rename to apps/routerconsole/jsp/themes/console/light/images/console_status_stopped.png
diff --git a/installer/resources/themes/console/light/images/dropdown.png b/apps/routerconsole/jsp/themes/console/light/images/dropdown.png
similarity index 100%
rename from installer/resources/themes/console/light/images/dropdown.png
rename to apps/routerconsole/jsp/themes/console/light/images/dropdown.png
diff --git a/installer/resources/themes/console/light/images/dropdown_active.png b/apps/routerconsole/jsp/themes/console/light/images/dropdown_active.png
similarity index 100%
rename from installer/resources/themes/console/light/images/dropdown_active.png
rename to apps/routerconsole/jsp/themes/console/light/images/dropdown_active.png
diff --git a/installer/resources/themes/console/light/images/dropdown_hover.png b/apps/routerconsole/jsp/themes/console/light/images/dropdown_hover.png
similarity index 100%
rename from installer/resources/themes/console/light/images/dropdown_hover.png
rename to apps/routerconsole/jsp/themes/console/light/images/dropdown_hover.png
diff --git a/installer/resources/themes/console/light/images/eye.png b/apps/routerconsole/jsp/themes/console/light/images/eye.png
similarity index 100%
rename from installer/resources/themes/console/light/images/eye.png
rename to apps/routerconsole/jsp/themes/console/light/images/eye.png
diff --git a/installer/resources/themes/console/light/images/favicon.ico b/apps/routerconsole/jsp/themes/console/light/images/favicon.ico
similarity index 100%
rename from installer/resources/themes/console/light/images/favicon.ico
rename to apps/routerconsole/jsp/themes/console/light/images/favicon.ico
diff --git a/installer/resources/themes/console/light/images/flower.png b/apps/routerconsole/jsp/themes/console/light/images/flower.png
similarity index 100%
rename from installer/resources/themes/console/light/images/flower.png
rename to apps/routerconsole/jsp/themes/console/light/images/flower.png
diff --git a/installer/resources/themes/console/light/images/globe.png b/apps/routerconsole/jsp/themes/console/light/images/globe.png
similarity index 100%
rename from installer/resources/themes/console/light/images/globe.png
rename to apps/routerconsole/jsp/themes/console/light/images/globe.png
diff --git a/installer/resources/themes/console/light/images/header.png b/apps/routerconsole/jsp/themes/console/light/images/header.png
similarity index 100%
rename from installer/resources/themes/console/light/images/header.png
rename to apps/routerconsole/jsp/themes/console/light/images/header.png
diff --git a/installer/resources/themes/console/light/images/help.png b/apps/routerconsole/jsp/themes/console/light/images/help.png
similarity index 100%
rename from installer/resources/themes/console/light/images/help.png
rename to apps/routerconsole/jsp/themes/console/light/images/help.png
diff --git a/installer/resources/themes/console/light/images/i2plogo.png b/apps/routerconsole/jsp/themes/console/light/images/i2plogo.png
similarity index 100%
rename from installer/resources/themes/console/light/images/i2plogo.png
rename to apps/routerconsole/jsp/themes/console/light/images/i2plogo.png
diff --git a/installer/resources/themes/console/light/images/inbox.png b/apps/routerconsole/jsp/themes/console/light/images/inbox.png
similarity index 100%
rename from installer/resources/themes/console/light/images/inbox.png
rename to apps/routerconsole/jsp/themes/console/light/images/inbox.png
diff --git a/installer/resources/themes/console/light/images/infohelp.png b/apps/routerconsole/jsp/themes/console/light/images/infohelp.png
similarity index 100%
rename from installer/resources/themes/console/light/images/infohelp.png
rename to apps/routerconsole/jsp/themes/console/light/images/infohelp.png
diff --git a/installer/resources/themes/console/light/images/infowarn.png b/apps/routerconsole/jsp/themes/console/light/images/infowarn.png
similarity index 100%
rename from installer/resources/themes/console/light/images/infowarn.png
rename to apps/routerconsole/jsp/themes/console/light/images/infowarn.png
diff --git a/installer/resources/themes/console/light/images/link.png b/apps/routerconsole/jsp/themes/console/light/images/link.png
similarity index 100%
rename from installer/resources/themes/console/light/images/link.png
rename to apps/routerconsole/jsp/themes/console/light/images/link.png
diff --git a/installer/resources/themes/console/light/images/magnet.png b/apps/routerconsole/jsp/themes/console/light/images/magnet.png
similarity index 100%
rename from installer/resources/themes/console/light/images/magnet.png
rename to apps/routerconsole/jsp/themes/console/light/images/magnet.png
diff --git a/installer/resources/themes/console/light/images/mail_black.png b/apps/routerconsole/jsp/themes/console/light/images/mail_black.png
similarity index 100%
rename from installer/resources/themes/console/light/images/mail_black.png
rename to apps/routerconsole/jsp/themes/console/light/images/mail_black.png
diff --git a/installer/resources/themes/console/light/images/move_bottom.png b/apps/routerconsole/jsp/themes/console/light/images/move_bottom.png
similarity index 100%
rename from installer/resources/themes/console/light/images/move_bottom.png
rename to apps/routerconsole/jsp/themes/console/light/images/move_bottom.png
diff --git a/installer/resources/themes/console/light/images/move_down.png b/apps/routerconsole/jsp/themes/console/light/images/move_down.png
similarity index 100%
rename from installer/resources/themes/console/light/images/move_down.png
rename to apps/routerconsole/jsp/themes/console/light/images/move_down.png
diff --git a/installer/resources/themes/console/light/images/move_top.png b/apps/routerconsole/jsp/themes/console/light/images/move_top.png
similarity index 100%
rename from installer/resources/themes/console/light/images/move_top.png
rename to apps/routerconsole/jsp/themes/console/light/images/move_top.png
diff --git a/installer/resources/themes/console/light/images/move_up.png b/apps/routerconsole/jsp/themes/console/light/images/move_up.png
similarity index 100%
rename from installer/resources/themes/console/light/images/move_up.png
rename to apps/routerconsole/jsp/themes/console/light/images/move_up.png
diff --git a/installer/resources/themes/console/light/images/news.png b/apps/routerconsole/jsp/themes/console/light/images/news.png
similarity index 100%
rename from installer/resources/themes/console/light/images/news.png
rename to apps/routerconsole/jsp/themes/console/light/images/news.png
diff --git a/installer/resources/themes/console/light/images/newsbullet_mini.png b/apps/routerconsole/jsp/themes/console/light/images/newsbullet_mini.png
similarity index 100%
rename from installer/resources/themes/console/light/images/newsbullet_mini.png
rename to apps/routerconsole/jsp/themes/console/light/images/newsbullet_mini.png
diff --git a/installer/resources/themes/console/light/images/newtab.png b/apps/routerconsole/jsp/themes/console/light/images/newtab.png
similarity index 100%
rename from installer/resources/themes/console/light/images/newtab.png
rename to apps/routerconsole/jsp/themes/console/light/images/newtab.png
diff --git a/installer/resources/themes/console/light/images/server.png b/apps/routerconsole/jsp/themes/console/light/images/server.png
similarity index 100%
rename from installer/resources/themes/console/light/images/server.png
rename to apps/routerconsole/jsp/themes/console/light/images/server.png
diff --git a/installer/resources/themes/console/light/images/sort_down.png b/apps/routerconsole/jsp/themes/console/light/images/sort_down.png
similarity index 100%
rename from installer/resources/themes/console/light/images/sort_down.png
rename to apps/routerconsole/jsp/themes/console/light/images/sort_down.png
diff --git a/installer/resources/themes/console/light/images/sort_up.png b/apps/routerconsole/jsp/themes/console/light/images/sort_up.png
similarity index 100%
rename from installer/resources/themes/console/light/images/sort_up.png
rename to apps/routerconsole/jsp/themes/console/light/images/sort_up.png
diff --git a/installer/resources/themes/console/light/images/thumbnail.png b/apps/routerconsole/jsp/themes/console/light/images/thumbnail.png
similarity index 100%
rename from installer/resources/themes/console/light/images/thumbnail.png
rename to apps/routerconsole/jsp/themes/console/light/images/thumbnail.png
diff --git a/installer/resources/themes/console/light/images/warn.png b/apps/routerconsole/jsp/themes/console/light/images/warn.png
similarity index 100%
rename from installer/resources/themes/console/light/images/warn.png
rename to apps/routerconsole/jsp/themes/console/light/images/warn.png
diff --git a/installer/resources/themes/console/light/images/warning.png b/apps/routerconsole/jsp/themes/console/light/images/warning.png
similarity index 100%
rename from installer/resources/themes/console/light/images/warning.png
rename to apps/routerconsole/jsp/themes/console/light/images/warning.png
diff --git a/installer/resources/themes/console/light/mobile.css b/apps/routerconsole/jsp/themes/console/light/mobile.css
similarity index 100%
rename from installer/resources/themes/console/light/mobile.css
rename to apps/routerconsole/jsp/themes/console/light/mobile.css
diff --git a/installer/resources/themes/i2ptunnel/dark/i2ptunnel.css b/apps/routerconsole/jsp/themes/i2ptunnel/dark/i2ptunnel.css
similarity index 100%
rename from installer/resources/themes/i2ptunnel/dark/i2ptunnel.css
rename to apps/routerconsole/jsp/themes/i2ptunnel/dark/i2ptunnel.css
diff --git a/installer/resources/themes/i2ptunnel/light/i2ptunnel.css b/apps/routerconsole/jsp/themes/i2ptunnel/light/i2ptunnel.css
similarity index 100%
rename from installer/resources/themes/i2ptunnel/light/i2ptunnel.css
rename to apps/routerconsole/jsp/themes/i2ptunnel/light/i2ptunnel.css
diff --git a/installer/resources/themes/snark/dark/favicon.ico b/apps/routerconsole/jsp/themes/snark/dark/favicon.ico
similarity index 100%
rename from installer/resources/themes/snark/dark/favicon.ico
rename to apps/routerconsole/jsp/themes/snark/dark/favicon.ico
diff --git a/installer/resources/themes/snark/dark/images/add.png b/apps/routerconsole/jsp/themes/snark/dark/images/add.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/add.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/add.png
diff --git a/installer/resources/themes/snark/dark/images/author.png b/apps/routerconsole/jsp/themes/snark/dark/images/author.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/author.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/author.png
diff --git a/installer/resources/themes/snark/dark/images/bullet.png b/apps/routerconsole/jsp/themes/snark/dark/images/bullet.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/bullet.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/bullet.png
diff --git a/installer/resources/themes/snark/dark/images/button_forum.png b/apps/routerconsole/jsp/themes/snark/dark/images/button_forum.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/button_forum.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/button_forum.png
diff --git a/installer/resources/themes/snark/dark/images/button_forum_active.png b/apps/routerconsole/jsp/themes/snark/dark/images/button_forum_active.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/button_forum_active.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/button_forum_active.png
diff --git a/installer/resources/themes/snark/dark/images/button_forum_hover.png b/apps/routerconsole/jsp/themes/snark/dark/images/button_forum_hover.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/button_forum_hover.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/button_forum_hover.png
diff --git a/installer/resources/themes/snark/dark/images/button_snark.png b/apps/routerconsole/jsp/themes/snark/dark/images/button_snark.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/button_snark.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/button_snark.png
diff --git a/installer/resources/themes/snark/dark/images/button_snark_active.png b/apps/routerconsole/jsp/themes/snark/dark/images/button_snark_active.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/button_snark_active.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/button_snark_active.png
diff --git a/installer/resources/themes/snark/dark/images/button_snark_hover.png b/apps/routerconsole/jsp/themes/snark/dark/images/button_snark_hover.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/button_snark_hover.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/button_snark_hover.png
diff --git a/installer/resources/themes/snark/dark/images/button_tracker.png b/apps/routerconsole/jsp/themes/snark/dark/images/button_tracker.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/button_tracker.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/button_tracker.png
diff --git a/installer/resources/themes/snark/dark/images/button_tracker_active.png b/apps/routerconsole/jsp/themes/snark/dark/images/button_tracker_active.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/button_tracker_active.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/button_tracker_active.png
diff --git a/installer/resources/themes/snark/dark/images/button_tracker_hover.png b/apps/routerconsole/jsp/themes/snark/dark/images/button_tracker_hover.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/button_tracker_hover.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/button_tracker_hover.png
diff --git a/installer/resources/themes/snark/dark/images/clock.png b/apps/routerconsole/jsp/themes/snark/dark/images/clock.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/clock.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/clock.png
diff --git a/installer/resources/themes/snark/dark/images/comment.png b/apps/routerconsole/jsp/themes/snark/dark/images/comment.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/comment.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/comment.png
diff --git a/installer/resources/themes/snark/dark/images/complete.png b/apps/routerconsole/jsp/themes/snark/dark/images/complete.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/complete.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/complete.png
diff --git a/installer/resources/themes/snark/dark/images/config.png b/apps/routerconsole/jsp/themes/snark/dark/images/config.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/config.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/config.png
diff --git a/installer/resources/themes/snark/dark/images/configuration.png b/apps/routerconsole/jsp/themes/snark/dark/images/configuration.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/configuration.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/configuration.png
diff --git a/installer/resources/themes/snark/dark/images/create.png b/apps/routerconsole/jsp/themes/snark/dark/images/create.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/create.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/create.png
diff --git a/installer/resources/themes/snark/dark/images/create0.png b/apps/routerconsole/jsp/themes/snark/dark/images/create0.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/create0.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/create0.png
diff --git a/installer/resources/themes/snark/dark/images/debug.png b/apps/routerconsole/jsp/themes/snark/dark/images/debug.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/debug.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/debug.png
diff --git a/installer/resources/themes/snark/dark/images/delete.png b/apps/routerconsole/jsp/themes/snark/dark/images/delete.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/delete.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/delete.png
diff --git a/installer/resources/themes/snark/dark/images/details.png b/apps/routerconsole/jsp/themes/snark/dark/images/details.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/details.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/details.png
diff --git a/installer/resources/themes/snark/dark/images/downloading.png b/apps/routerconsole/jsp/themes/snark/dark/images/downloading.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/downloading.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/downloading.png
diff --git a/installer/resources/themes/snark/dark/images/dropdown.png b/apps/routerconsole/jsp/themes/snark/dark/images/dropdown.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/dropdown.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/dropdown.png
diff --git a/installer/resources/themes/snark/dark/images/dropdown_active.png b/apps/routerconsole/jsp/themes/snark/dark/images/dropdown_active.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/dropdown_active.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/dropdown_active.png
diff --git a/installer/resources/themes/snark/dark/images/dropdown_hover.png b/apps/routerconsole/jsp/themes/snark/dark/images/dropdown_hover.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/dropdown_hover.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/dropdown_hover.png
diff --git a/installer/resources/themes/snark/dark/images/eta.png b/apps/routerconsole/jsp/themes/snark/dark/images/eta.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/eta.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/eta.png
diff --git a/installer/resources/themes/snark/dark/images/file.png b/apps/routerconsole/jsp/themes/snark/dark/images/file.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/file.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/file.png
diff --git a/installer/resources/themes/snark/dark/images/file_sm.png b/apps/routerconsole/jsp/themes/snark/dark/images/file_sm.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/file_sm.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/file_sm.png
diff --git a/installer/resources/themes/snark/dark/images/first.png b/apps/routerconsole/jsp/themes/snark/dark/images/first.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/first.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/first.png
diff --git a/installer/resources/themes/snark/dark/images/head_rx.png b/apps/routerconsole/jsp/themes/snark/dark/images/head_rx.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/head_rx.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/head_rx.png
diff --git a/installer/resources/themes/snark/dark/images/head_rxspeed.png b/apps/routerconsole/jsp/themes/snark/dark/images/head_rxspeed.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/head_rxspeed.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/head_rxspeed.png
diff --git a/installer/resources/themes/snark/dark/images/head_tx.png b/apps/routerconsole/jsp/themes/snark/dark/images/head_tx.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/head_tx.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/head_tx.png
diff --git a/installer/resources/themes/snark/dark/images/head_txspeed.png b/apps/routerconsole/jsp/themes/snark/dark/images/head_txspeed.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/head_txspeed.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/head_txspeed.png
diff --git a/installer/resources/themes/snark/dark/images/hidepeers.png b/apps/routerconsole/jsp/themes/snark/dark/images/hidepeers.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/hidepeers.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/hidepeers.png
diff --git a/installer/resources/themes/snark/dark/images/infocircle.png b/apps/routerconsole/jsp/themes/snark/dark/images/infocircle.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/infocircle.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/infocircle.png
diff --git a/installer/resources/themes/snark/dark/images/last.png b/apps/routerconsole/jsp/themes/snark/dark/images/last.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/last.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/last.png
diff --git a/installer/resources/themes/snark/dark/images/next.png b/apps/routerconsole/jsp/themes/snark/dark/images/next.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/next.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/next.png
diff --git a/installer/resources/themes/snark/dark/images/nopeers.png b/apps/routerconsole/jsp/themes/snark/dark/images/nopeers.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/nopeers.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/nopeers.png
diff --git a/installer/resources/themes/snark/dark/images/peer.png b/apps/routerconsole/jsp/themes/snark/dark/images/peer.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/peer.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/peer.png
diff --git a/installer/resources/themes/snark/dark/images/previous.png b/apps/routerconsole/jsp/themes/snark/dark/images/previous.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/previous.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/previous.png
diff --git a/installer/resources/themes/snark/dark/images/priority.png b/apps/routerconsole/jsp/themes/snark/dark/images/priority.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/priority.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/priority.png
diff --git a/installer/resources/themes/snark/dark/images/progressbar.gif b/apps/routerconsole/jsp/themes/snark/dark/images/progressbar.gif
similarity index 100%
rename from installer/resources/themes/snark/dark/images/progressbar.gif
rename to apps/routerconsole/jsp/themes/snark/dark/images/progressbar.gif
diff --git a/installer/resources/themes/snark/dark/images/rateme.png b/apps/routerconsole/jsp/themes/snark/dark/images/rateme.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/rateme.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/rateme.png
diff --git a/installer/resources/themes/snark/dark/images/remove.png b/apps/routerconsole/jsp/themes/snark/dark/images/remove.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/remove.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/remove.png
diff --git a/installer/resources/themes/snark/dark/images/seeding.png b/apps/routerconsole/jsp/themes/snark/dark/images/seeding.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/seeding.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/seeding.png
diff --git a/installer/resources/themes/snark/dark/images/showpeers.png b/apps/routerconsole/jsp/themes/snark/dark/images/showpeers.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/showpeers.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/showpeers.png
diff --git a/installer/resources/themes/snark/dark/images/size.png b/apps/routerconsole/jsp/themes/snark/dark/images/size.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/size.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/size.png
diff --git a/installer/resources/themes/snark/dark/images/snark_add.png b/apps/routerconsole/jsp/themes/snark/dark/images/snark_add.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/snark_add.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/snark_add.png
diff --git a/installer/resources/themes/snark/dark/images/snark_create.png b/apps/routerconsole/jsp/themes/snark/dark/images/snark_create.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/snark_create.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/snark_create.png
diff --git a/installer/resources/themes/snark/dark/images/stalled.png b/apps/routerconsole/jsp/themes/snark/dark/images/stalled.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/stalled.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/stalled.png
diff --git a/installer/resources/themes/snark/dark/images/start.png b/apps/routerconsole/jsp/themes/snark/dark/images/start.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/start.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/start.png
diff --git a/installer/resources/themes/snark/dark/images/start_all.png b/apps/routerconsole/jsp/themes/snark/dark/images/start_all.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/start_all.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/start_all.png
diff --git a/installer/resources/themes/snark/dark/images/status.png b/apps/routerconsole/jsp/themes/snark/dark/images/status.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/status.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/status.png
diff --git a/installer/resources/themes/snark/dark/images/stop.png b/apps/routerconsole/jsp/themes/snark/dark/images/stop.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/stop.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/stop.png
diff --git a/installer/resources/themes/snark/dark/images/stop_all.png b/apps/routerconsole/jsp/themes/snark/dark/images/stop_all.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/stop_all.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/stop_all.png
diff --git a/installer/resources/themes/snark/dark/images/stopped.png b/apps/routerconsole/jsp/themes/snark/dark/images/stopped.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/stopped.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/stopped.png
diff --git a/installer/resources/themes/snark/dark/images/torrent.png b/apps/routerconsole/jsp/themes/snark/dark/images/torrent.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/torrent.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/torrent.png
diff --git a/installer/resources/themes/snark/dark/images/trackererror.png b/apps/routerconsole/jsp/themes/snark/dark/images/trackererror.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/trackererror.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/trackererror.png
diff --git a/installer/resources/themes/snark/dark/images/up.png b/apps/routerconsole/jsp/themes/snark/dark/images/up.png
similarity index 100%
rename from installer/resources/themes/snark/dark/images/up.png
rename to apps/routerconsole/jsp/themes/snark/dark/images/up.png
diff --git a/installer/resources/themes/snark/dark/nocollapse.css b/apps/routerconsole/jsp/themes/snark/dark/nocollapse.css
similarity index 100%
rename from installer/resources/themes/snark/dark/nocollapse.css
rename to apps/routerconsole/jsp/themes/snark/dark/nocollapse.css
diff --git a/installer/resources/themes/snark/dark/snark.css b/apps/routerconsole/jsp/themes/snark/dark/snark.css
similarity index 100%
rename from installer/resources/themes/snark/dark/snark.css
rename to apps/routerconsole/jsp/themes/snark/dark/snark.css
diff --git a/installer/resources/themes/snark/light/favicon.ico b/apps/routerconsole/jsp/themes/snark/light/favicon.ico
similarity index 100%
rename from installer/resources/themes/snark/light/favicon.ico
rename to apps/routerconsole/jsp/themes/snark/light/favicon.ico
diff --git a/installer/resources/themes/snark/light/images/add.png b/apps/routerconsole/jsp/themes/snark/light/images/add.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/add.png
rename to apps/routerconsole/jsp/themes/snark/light/images/add.png
diff --git a/installer/resources/themes/snark/light/images/author.png b/apps/routerconsole/jsp/themes/snark/light/images/author.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/author.png
rename to apps/routerconsole/jsp/themes/snark/light/images/author.png
diff --git a/installer/resources/themes/snark/light/images/bullet.png b/apps/routerconsole/jsp/themes/snark/light/images/bullet.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/bullet.png
rename to apps/routerconsole/jsp/themes/snark/light/images/bullet.png
diff --git a/installer/resources/themes/snark/light/images/button_forum.png b/apps/routerconsole/jsp/themes/snark/light/images/button_forum.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/button_forum.png
rename to apps/routerconsole/jsp/themes/snark/light/images/button_forum.png
diff --git a/installer/resources/themes/snark/light/images/button_forum_active.png b/apps/routerconsole/jsp/themes/snark/light/images/button_forum_active.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/button_forum_active.png
rename to apps/routerconsole/jsp/themes/snark/light/images/button_forum_active.png
diff --git a/installer/resources/themes/snark/light/images/button_forum_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/button_forum_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/button_forum_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/button_forum_hover.png
diff --git a/installer/resources/themes/snark/light/images/button_snark.png b/apps/routerconsole/jsp/themes/snark/light/images/button_snark.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/button_snark.png
rename to apps/routerconsole/jsp/themes/snark/light/images/button_snark.png
diff --git a/installer/resources/themes/snark/light/images/button_snark_active.png b/apps/routerconsole/jsp/themes/snark/light/images/button_snark_active.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/button_snark_active.png
rename to apps/routerconsole/jsp/themes/snark/light/images/button_snark_active.png
diff --git a/installer/resources/themes/snark/light/images/button_snark_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/button_snark_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/button_snark_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/button_snark_hover.png
diff --git a/installer/resources/themes/snark/light/images/button_tracker.png b/apps/routerconsole/jsp/themes/snark/light/images/button_tracker.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/button_tracker.png
rename to apps/routerconsole/jsp/themes/snark/light/images/button_tracker.png
diff --git a/installer/resources/themes/snark/light/images/button_tracker_active.png b/apps/routerconsole/jsp/themes/snark/light/images/button_tracker_active.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/button_tracker_active.png
rename to apps/routerconsole/jsp/themes/snark/light/images/button_tracker_active.png
diff --git a/installer/resources/themes/snark/light/images/button_tracker_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/button_tracker_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/button_tracker_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/button_tracker_hover.png
diff --git a/installer/resources/themes/snark/light/images/clock.png b/apps/routerconsole/jsp/themes/snark/light/images/clock.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/clock.png
rename to apps/routerconsole/jsp/themes/snark/light/images/clock.png
diff --git a/installer/resources/themes/snark/light/images/comment.png b/apps/routerconsole/jsp/themes/snark/light/images/comment.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/comment.png
rename to apps/routerconsole/jsp/themes/snark/light/images/comment.png
diff --git a/installer/resources/themes/snark/light/images/complete.png b/apps/routerconsole/jsp/themes/snark/light/images/complete.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/complete.png
rename to apps/routerconsole/jsp/themes/snark/light/images/complete.png
diff --git a/installer/resources/themes/snark/light/images/config.png b/apps/routerconsole/jsp/themes/snark/light/images/config.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/config.png
rename to apps/routerconsole/jsp/themes/snark/light/images/config.png
diff --git a/installer/resources/themes/snark/light/images/configuration.png b/apps/routerconsole/jsp/themes/snark/light/images/configuration.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/configuration.png
rename to apps/routerconsole/jsp/themes/snark/light/images/configuration.png
diff --git a/installer/resources/themes/snark/light/images/create.png b/apps/routerconsole/jsp/themes/snark/light/images/create.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/create.png
rename to apps/routerconsole/jsp/themes/snark/light/images/create.png
diff --git a/installer/resources/themes/snark/light/images/debug.png b/apps/routerconsole/jsp/themes/snark/light/images/debug.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/debug.png
rename to apps/routerconsole/jsp/themes/snark/light/images/debug.png
diff --git a/installer/resources/themes/snark/light/images/delete.png b/apps/routerconsole/jsp/themes/snark/light/images/delete.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/delete.png
rename to apps/routerconsole/jsp/themes/snark/light/images/delete.png
diff --git a/installer/resources/themes/snark/light/images/delete_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/delete_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/delete_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/delete_hover.png
diff --git a/installer/resources/themes/snark/light/images/details.png b/apps/routerconsole/jsp/themes/snark/light/images/details.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/details.png
rename to apps/routerconsole/jsp/themes/snark/light/images/details.png
diff --git a/installer/resources/themes/snark/light/images/downloading.png b/apps/routerconsole/jsp/themes/snark/light/images/downloading.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/downloading.png
rename to apps/routerconsole/jsp/themes/snark/light/images/downloading.png
diff --git a/installer/resources/themes/snark/light/images/dropdown.png b/apps/routerconsole/jsp/themes/snark/light/images/dropdown.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/dropdown.png
rename to apps/routerconsole/jsp/themes/snark/light/images/dropdown.png
diff --git a/installer/resources/themes/snark/light/images/eta.png b/apps/routerconsole/jsp/themes/snark/light/images/eta.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/eta.png
rename to apps/routerconsole/jsp/themes/snark/light/images/eta.png
diff --git a/installer/resources/themes/snark/light/images/file.png b/apps/routerconsole/jsp/themes/snark/light/images/file.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/file.png
rename to apps/routerconsole/jsp/themes/snark/light/images/file.png
diff --git a/installer/resources/themes/snark/light/images/first.png b/apps/routerconsole/jsp/themes/snark/light/images/first.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/first.png
rename to apps/routerconsole/jsp/themes/snark/light/images/first.png
diff --git a/installer/resources/themes/snark/light/images/first_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/first_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/first_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/first_hover.png
diff --git a/installer/resources/themes/snark/light/images/head_rx.png b/apps/routerconsole/jsp/themes/snark/light/images/head_rx.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/head_rx.png
rename to apps/routerconsole/jsp/themes/snark/light/images/head_rx.png
diff --git a/installer/resources/themes/snark/light/images/head_rxspeed.png b/apps/routerconsole/jsp/themes/snark/light/images/head_rxspeed.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/head_rxspeed.png
rename to apps/routerconsole/jsp/themes/snark/light/images/head_rxspeed.png
diff --git a/installer/resources/themes/snark/light/images/head_tx.png b/apps/routerconsole/jsp/themes/snark/light/images/head_tx.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/head_tx.png
rename to apps/routerconsole/jsp/themes/snark/light/images/head_tx.png
diff --git a/installer/resources/themes/snark/light/images/head_txspeed.png b/apps/routerconsole/jsp/themes/snark/light/images/head_txspeed.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/head_txspeed.png
rename to apps/routerconsole/jsp/themes/snark/light/images/head_txspeed.png
diff --git a/installer/resources/themes/snark/light/images/hidepeers.png b/apps/routerconsole/jsp/themes/snark/light/images/hidepeers.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/hidepeers.png
rename to apps/routerconsole/jsp/themes/snark/light/images/hidepeers.png
diff --git a/installer/resources/themes/snark/light/images/infocircle.png b/apps/routerconsole/jsp/themes/snark/light/images/infocircle.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/infocircle.png
rename to apps/routerconsole/jsp/themes/snark/light/images/infocircle.png
diff --git a/installer/resources/themes/snark/light/images/last.png b/apps/routerconsole/jsp/themes/snark/light/images/last.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/last.png
rename to apps/routerconsole/jsp/themes/snark/light/images/last.png
diff --git a/installer/resources/themes/snark/light/images/last_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/last_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/last_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/last_hover.png
diff --git a/installer/resources/themes/snark/light/images/next.png b/apps/routerconsole/jsp/themes/snark/light/images/next.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/next.png
rename to apps/routerconsole/jsp/themes/snark/light/images/next.png
diff --git a/installer/resources/themes/snark/light/images/next_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/next_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/next_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/next_hover.png
diff --git a/installer/resources/themes/snark/light/images/nopeers.png b/apps/routerconsole/jsp/themes/snark/light/images/nopeers.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/nopeers.png
rename to apps/routerconsole/jsp/themes/snark/light/images/nopeers.png
diff --git a/installer/resources/themes/snark/light/images/peer.png b/apps/routerconsole/jsp/themes/snark/light/images/peer.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/peer.png
rename to apps/routerconsole/jsp/themes/snark/light/images/peer.png
diff --git a/installer/resources/themes/snark/light/images/previous.png b/apps/routerconsole/jsp/themes/snark/light/images/previous.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/previous.png
rename to apps/routerconsole/jsp/themes/snark/light/images/previous.png
diff --git a/installer/resources/themes/snark/light/images/previous_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/previous_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/previous_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/previous_hover.png
diff --git a/installer/resources/themes/snark/light/images/priority.png b/apps/routerconsole/jsp/themes/snark/light/images/priority.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/priority.png
rename to apps/routerconsole/jsp/themes/snark/light/images/priority.png
diff --git a/installer/resources/themes/snark/light/images/progressbar.gif b/apps/routerconsole/jsp/themes/snark/light/images/progressbar.gif
similarity index 100%
rename from installer/resources/themes/snark/light/images/progressbar.gif
rename to apps/routerconsole/jsp/themes/snark/light/images/progressbar.gif
diff --git a/installer/resources/themes/snark/light/images/rateme.png b/apps/routerconsole/jsp/themes/snark/light/images/rateme.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/rateme.png
rename to apps/routerconsole/jsp/themes/snark/light/images/rateme.png
diff --git a/installer/resources/themes/snark/light/images/remove.png b/apps/routerconsole/jsp/themes/snark/light/images/remove.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/remove.png
rename to apps/routerconsole/jsp/themes/snark/light/images/remove.png
diff --git a/installer/resources/themes/snark/light/images/remove_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/remove_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/remove_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/remove_hover.png
diff --git a/installer/resources/themes/snark/light/images/seeding.png b/apps/routerconsole/jsp/themes/snark/light/images/seeding.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/seeding.png
rename to apps/routerconsole/jsp/themes/snark/light/images/seeding.png
diff --git a/installer/resources/themes/snark/light/images/showpeers.png b/apps/routerconsole/jsp/themes/snark/light/images/showpeers.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/showpeers.png
rename to apps/routerconsole/jsp/themes/snark/light/images/showpeers.png
diff --git a/installer/resources/themes/snark/light/images/size.png b/apps/routerconsole/jsp/themes/snark/light/images/size.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/size.png
rename to apps/routerconsole/jsp/themes/snark/light/images/size.png
diff --git a/installer/resources/themes/snark/light/images/snark_add.png b/apps/routerconsole/jsp/themes/snark/light/images/snark_add.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/snark_add.png
rename to apps/routerconsole/jsp/themes/snark/light/images/snark_add.png
diff --git a/installer/resources/themes/snark/light/images/snark_create.png b/apps/routerconsole/jsp/themes/snark/light/images/snark_create.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/snark_create.png
rename to apps/routerconsole/jsp/themes/snark/light/images/snark_create.png
diff --git a/installer/resources/themes/snark/light/images/stalled.png b/apps/routerconsole/jsp/themes/snark/light/images/stalled.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/stalled.png
rename to apps/routerconsole/jsp/themes/snark/light/images/stalled.png
diff --git a/installer/resources/themes/snark/light/images/start.png b/apps/routerconsole/jsp/themes/snark/light/images/start.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/start.png
rename to apps/routerconsole/jsp/themes/snark/light/images/start.png
diff --git a/installer/resources/themes/snark/light/images/start_all.png b/apps/routerconsole/jsp/themes/snark/light/images/start_all.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/start_all.png
rename to apps/routerconsole/jsp/themes/snark/light/images/start_all.png
diff --git a/installer/resources/themes/snark/light/images/start_all_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/start_all_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/start_all_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/start_all_hover.png
diff --git a/installer/resources/themes/snark/light/images/start_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/start_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/start_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/start_hover.png
diff --git a/installer/resources/themes/snark/light/images/status.png b/apps/routerconsole/jsp/themes/snark/light/images/status.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/status.png
rename to apps/routerconsole/jsp/themes/snark/light/images/status.png
diff --git a/installer/resources/themes/snark/light/images/stop.png b/apps/routerconsole/jsp/themes/snark/light/images/stop.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/stop.png
rename to apps/routerconsole/jsp/themes/snark/light/images/stop.png
diff --git a/installer/resources/themes/snark/light/images/stop_all.png b/apps/routerconsole/jsp/themes/snark/light/images/stop_all.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/stop_all.png
rename to apps/routerconsole/jsp/themes/snark/light/images/stop_all.png
diff --git a/installer/resources/themes/snark/light/images/stop_all_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/stop_all_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/stop_all_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/stop_all_hover.png
diff --git a/installer/resources/themes/snark/light/images/stop_hover.png b/apps/routerconsole/jsp/themes/snark/light/images/stop_hover.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/stop_hover.png
rename to apps/routerconsole/jsp/themes/snark/light/images/stop_hover.png
diff --git a/installer/resources/themes/snark/light/images/stopped.png b/apps/routerconsole/jsp/themes/snark/light/images/stopped.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/stopped.png
rename to apps/routerconsole/jsp/themes/snark/light/images/stopped.png
diff --git a/installer/resources/themes/snark/light/images/torrent.png b/apps/routerconsole/jsp/themes/snark/light/images/torrent.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/torrent.png
rename to apps/routerconsole/jsp/themes/snark/light/images/torrent.png
diff --git a/installer/resources/themes/snark/light/images/trackererror.png b/apps/routerconsole/jsp/themes/snark/light/images/trackererror.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/trackererror.png
rename to apps/routerconsole/jsp/themes/snark/light/images/trackererror.png
diff --git a/installer/resources/themes/snark/light/images/up.png b/apps/routerconsole/jsp/themes/snark/light/images/up.png
similarity index 100%
rename from installer/resources/themes/snark/light/images/up.png
rename to apps/routerconsole/jsp/themes/snark/light/images/up.png
diff --git a/installer/resources/themes/snark/light/nocollapse.css b/apps/routerconsole/jsp/themes/snark/light/nocollapse.css
similarity index 100%
rename from installer/resources/themes/snark/light/nocollapse.css
rename to apps/routerconsole/jsp/themes/snark/light/nocollapse.css
diff --git a/installer/resources/themes/snark/light/snark.css b/apps/routerconsole/jsp/themes/snark/light/snark.css
similarity index 100%
rename from installer/resources/themes/snark/light/snark.css
rename to apps/routerconsole/jsp/themes/snark/light/snark.css
diff --git a/installer/resources/themes/snark/ubergine/favicon.ico b/apps/routerconsole/jsp/themes/snark/ubergine/favicon.ico
similarity index 100%
rename from installer/resources/themes/snark/ubergine/favicon.ico
rename to apps/routerconsole/jsp/themes/snark/ubergine/favicon.ico
diff --git a/installer/resources/themes/snark/ubergine/images/accept.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/accept.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/accept.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/accept.png
diff --git a/installer/resources/themes/snark/ubergine/images/add.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/add.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/add.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/add.png
diff --git a/installer/resources/themes/snark/ubergine/images/author.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/author.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/author.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/author.png
diff --git a/installer/resources/themes/snark/ubergine/images/btn_stop.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/btn_stop.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/btn_stop.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/btn_stop.png
diff --git a/installer/resources/themes/snark/ubergine/images/bullet.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/bullet.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/bullet.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/bullet.png
diff --git a/installer/resources/themes/snark/ubergine/images/button_forum.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/button_forum.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum.png
diff --git a/installer/resources/themes/snark/ubergine/images/button_forum_active.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum_active.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/button_forum_active.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum_active.png
diff --git a/installer/resources/themes/snark/ubergine/images/button_forum_hover.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum_hover.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/button_forum_hover.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum_hover.png
diff --git a/installer/resources/themes/snark/ubergine/images/button_snark.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/button_snark.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark.png
diff --git a/installer/resources/themes/snark/ubergine/images/button_snark_active.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark_active.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/button_snark_active.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark_active.png
diff --git a/installer/resources/themes/snark/ubergine/images/button_snark_hover.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark_hover.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/button_snark_hover.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark_hover.png
diff --git a/installer/resources/themes/snark/ubergine/images/button_tracker.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/button_tracker.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker.png
diff --git a/installer/resources/themes/snark/ubergine/images/button_tracker_active.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker_active.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/button_tracker_active.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker_active.png
diff --git a/installer/resources/themes/snark/ubergine/images/button_tracker_hover.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker_hover.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/button_tracker_hover.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker_hover.png
diff --git a/installer/resources/themes/snark/ubergine/images/cancel.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/cancel.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/cancel.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/cancel.png
diff --git a/installer/resources/themes/snark/ubergine/images/clock.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/clock.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/clock.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/clock.png
diff --git a/installer/resources/themes/snark/ubergine/images/comment.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/comment.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/comment.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/comment.png
diff --git a/installer/resources/themes/snark/ubergine/images/complete.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/complete.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/complete.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/complete.png
diff --git a/installer/resources/themes/snark/ubergine/images/config.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/config.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/config.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/config.png
diff --git a/installer/resources/themes/snark/ubergine/images/configuration.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/configuration.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/configuration.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/configuration.png
diff --git a/installer/resources/themes/snark/ubergine/images/create.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/create.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/create.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/create.png
diff --git a/installer/resources/themes/snark/ubergine/images/debug.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/debug.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/debug.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/debug.png
diff --git a/installer/resources/themes/snark/ubergine/images/delete.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/delete.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/delete.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/delete.png
diff --git a/installer/resources/themes/snark/ubergine/images/details.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/details.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/details.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/details.png
diff --git a/installer/resources/themes/snark/ubergine/images/downloading.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/downloading.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/downloading.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/downloading.png
diff --git a/installer/resources/themes/snark/ubergine/images/dropdown.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/dropdown.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/dropdown.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/dropdown.png
diff --git a/installer/resources/themes/snark/ubergine/images/dropdown_hover.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/dropdown_hover.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/dropdown_hover.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/dropdown_hover.png
diff --git a/installer/resources/themes/snark/ubergine/images/eta.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/eta.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/eta.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/eta.png
diff --git a/installer/resources/themes/snark/ubergine/images/file.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/file.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/file.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/file.png
diff --git a/installer/resources/themes/snark/ubergine/images/first.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/first.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/first.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/first.png
diff --git a/installer/resources/themes/snark/ubergine/images/graytile.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/graytile.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/graytile.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/graytile.png
diff --git a/installer/resources/themes/snark/ubergine/images/head_rx.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/head_rx.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/head_rx.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/head_rx.png
diff --git a/installer/resources/themes/snark/ubergine/images/head_rxspeed.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/head_rxspeed.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/head_rxspeed.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/head_rxspeed.png
diff --git a/installer/resources/themes/snark/ubergine/images/head_tx.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/head_tx.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/head_tx.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/head_tx.png
diff --git a/installer/resources/themes/snark/ubergine/images/head_txspeed.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/head_txspeed.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/head_txspeed.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/head_txspeed.png
diff --git a/installer/resources/themes/snark/ubergine/images/hidepeers.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/hidepeers.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/hidepeers.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/hidepeers.png
diff --git a/installer/resources/themes/snark/ubergine/images/infocircle.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/infocircle.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/infocircle.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/infocircle.png
diff --git a/installer/resources/themes/snark/ubergine/images/last.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/last.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/last.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/last.png
diff --git a/installer/resources/themes/snark/ubergine/images/next.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/next.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/next.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/next.png
diff --git a/installer/resources/themes/snark/ubergine/images/nopeers.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/nopeers.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/nopeers.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/nopeers.png
diff --git a/installer/resources/themes/snark/ubergine/images/nuke.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/nuke.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/nuke.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/nuke.png
diff --git a/installer/resources/themes/snark/ubergine/images/peer.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/peer.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/peer.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/peer.png
diff --git a/installer/resources/themes/snark/ubergine/images/previous.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/previous.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/previous.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/previous.png
diff --git a/installer/resources/themes/snark/ubergine/images/priority.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/priority.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/priority.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/priority.png
diff --git a/installer/resources/themes/snark/ubergine/images/progressbar.gif b/apps/routerconsole/jsp/themes/snark/ubergine/images/progressbar.gif
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/progressbar.gif
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/progressbar.gif
diff --git a/installer/resources/themes/snark/ubergine/images/rateme.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/rateme.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/rateme.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/rateme.png
diff --git a/installer/resources/themes/snark/ubergine/images/recheck.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/recheck.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/recheck.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/recheck.png
diff --git a/installer/resources/themes/snark/ubergine/images/remove.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/remove.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/remove.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/remove.png
diff --git a/installer/resources/themes/snark/ubergine/images/restore.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/restore.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/restore.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/restore.png
diff --git a/installer/resources/themes/snark/ubergine/images/seeding.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/seeding.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/seeding.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/seeding.png
diff --git a/installer/resources/themes/snark/ubergine/images/showpeers.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/showpeers.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/showpeers.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/showpeers.png
diff --git a/installer/resources/themes/snark/ubergine/images/size.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/size.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/size.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/size.png
diff --git a/installer/resources/themes/snark/ubergine/images/snark_add.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/snark_add.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/snark_add.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/snark_add.png
diff --git a/installer/resources/themes/snark/ubergine/images/snark_create.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/snark_create.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/snark_create.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/snark_create.png
diff --git a/installer/resources/themes/snark/ubergine/images/snarknav.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/snarknav.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav.png
diff --git a/installer/resources/themes/snark/ubergine/images/snarknav_lowlight.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav_lowlight.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/snarknav_lowlight.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav_lowlight.png
diff --git a/installer/resources/themes/snark/ubergine/images/snarknav_on.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav_on.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/snarknav_on.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav_on.png
diff --git a/installer/resources/themes/snark/ubergine/images/stalled.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/stalled.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/stalled.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/stalled.png
diff --git a/installer/resources/themes/snark/ubergine/images/start.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/start.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/start.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/start.png
diff --git a/installer/resources/themes/snark/ubergine/images/start_all.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/start_all.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/start_all.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/start_all.png
diff --git a/installer/resources/themes/snark/ubergine/images/status.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/status.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/status.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/status.png
diff --git a/installer/resources/themes/snark/ubergine/images/stop.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/stop.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/stop.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/stop.png
diff --git a/installer/resources/themes/snark/ubergine/images/stop_all.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/stop_all.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/stop_all.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/stop_all.png
diff --git a/installer/resources/themes/snark/ubergine/images/stopped.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/stopped.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/stopped.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/stopped.png
diff --git a/installer/resources/themes/snark/ubergine/images/tile2.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/tile2.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/tile2.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/tile2.png
diff --git a/installer/resources/themes/snark/ubergine/images/torrent.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/torrent.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/torrent.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/torrent.png
diff --git a/installer/resources/themes/snark/ubergine/images/trackererror.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/trackererror.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/trackererror.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/trackererror.png
diff --git a/installer/resources/themes/snark/ubergine/images/up.png b/apps/routerconsole/jsp/themes/snark/ubergine/images/up.png
similarity index 100%
rename from installer/resources/themes/snark/ubergine/images/up.png
rename to apps/routerconsole/jsp/themes/snark/ubergine/images/up.png
diff --git a/installer/resources/themes/snark/ubergine/nocollapse.css b/apps/routerconsole/jsp/themes/snark/ubergine/nocollapse.css
similarity index 100%
rename from installer/resources/themes/snark/ubergine/nocollapse.css
rename to apps/routerconsole/jsp/themes/snark/ubergine/nocollapse.css
diff --git a/installer/resources/themes/snark/ubergine/snark.css b/apps/routerconsole/jsp/themes/snark/ubergine/snark.css
similarity index 100%
rename from installer/resources/themes/snark/ubergine/snark.css
rename to apps/routerconsole/jsp/themes/snark/ubergine/snark.css
diff --git a/installer/resources/themes/snark/vanilla/favicon.ico b/apps/routerconsole/jsp/themes/snark/vanilla/favicon.ico
similarity index 100%
rename from installer/resources/themes/snark/vanilla/favicon.ico
rename to apps/routerconsole/jsp/themes/snark/vanilla/favicon.ico
diff --git a/installer/resources/themes/snark/vanilla/images/accept.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/accept.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/accept.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/accept.png
diff --git a/installer/resources/themes/snark/vanilla/images/add.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/add.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/add.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/add.png
diff --git a/installer/resources/themes/snark/vanilla/images/author.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/author.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/author.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/author.png
diff --git a/installer/resources/themes/snark/vanilla/images/btn_stop.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/btn_stop.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/btn_stop.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/btn_stop.png
diff --git a/installer/resources/themes/snark/vanilla/images/bullet.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/bullet.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/bullet.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/bullet.png
diff --git a/installer/resources/themes/snark/vanilla/images/button_forum.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/button_forum.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum.png
diff --git a/installer/resources/themes/snark/vanilla/images/button_forum_active.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum_active.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/button_forum_active.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum_active.png
diff --git a/installer/resources/themes/snark/vanilla/images/button_forum_hover.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum_hover.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/button_forum_hover.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum_hover.png
diff --git a/installer/resources/themes/snark/vanilla/images/button_snark.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/button_snark.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark.png
diff --git a/installer/resources/themes/snark/vanilla/images/button_snark_active.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark_active.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/button_snark_active.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark_active.png
diff --git a/installer/resources/themes/snark/vanilla/images/button_snark_hover.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark_hover.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/button_snark_hover.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark_hover.png
diff --git a/installer/resources/themes/snark/vanilla/images/button_tracker.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/button_tracker.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker.png
diff --git a/installer/resources/themes/snark/vanilla/images/button_tracker_active.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker_active.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/button_tracker_active.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker_active.png
diff --git a/installer/resources/themes/snark/vanilla/images/button_tracker_hover.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker_hover.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/button_tracker_hover.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker_hover.png
diff --git a/installer/resources/themes/snark/vanilla/images/clock.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/clock.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/clock.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/clock.png
diff --git a/installer/resources/themes/snark/vanilla/images/comment.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/comment.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/comment.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/comment.png
diff --git a/installer/resources/themes/snark/vanilla/images/complete.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/complete.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/complete.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/complete.png
diff --git a/installer/resources/themes/snark/vanilla/images/config.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/config.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/config.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/config.png
diff --git a/installer/resources/themes/snark/vanilla/images/configuration.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/configuration.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/configuration.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/configuration.png
diff --git a/installer/resources/themes/snark/vanilla/images/create.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/create.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/create.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/create.png
diff --git a/installer/resources/themes/snark/vanilla/images/debug.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/debug.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/debug.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/debug.png
diff --git a/installer/resources/themes/snark/vanilla/images/delete.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/delete.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/delete.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/delete.png
diff --git a/installer/resources/themes/snark/vanilla/images/details.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/details.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/details.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/details.png
diff --git a/installer/resources/themes/snark/vanilla/images/downloading.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/downloading.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/downloading.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/downloading.png
diff --git a/installer/resources/themes/snark/vanilla/images/dropdown.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/dropdown.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/dropdown.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/dropdown.png
diff --git a/installer/resources/themes/snark/vanilla/images/dropdown_hover.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/dropdown_hover.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/dropdown_hover.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/dropdown_hover.png
diff --git a/installer/resources/themes/snark/vanilla/images/eta.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/eta.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/eta.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/eta.png
diff --git a/installer/resources/themes/snark/vanilla/images/file.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/file.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/file.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/file.png
diff --git a/installer/resources/themes/snark/vanilla/images/first.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/first.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/first.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/first.png
diff --git a/installer/resources/themes/snark/vanilla/images/head_rx.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/head_rx.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/head_rx.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/head_rx.png
diff --git a/installer/resources/themes/snark/vanilla/images/head_rxspeed.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/head_rxspeed.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/head_rxspeed.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/head_rxspeed.png
diff --git a/installer/resources/themes/snark/vanilla/images/head_tx.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/head_tx.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/head_tx.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/head_tx.png
diff --git a/installer/resources/themes/snark/vanilla/images/head_txspeed.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/head_txspeed.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/head_txspeed.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/head_txspeed.png
diff --git a/installer/resources/themes/snark/vanilla/images/hidepeers.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/hidepeers.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/hidepeers.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/hidepeers.png
diff --git a/installer/resources/themes/snark/vanilla/images/infocircle.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/infocircle.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/infocircle.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/infocircle.png
diff --git a/installer/resources/themes/snark/vanilla/images/last.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/last.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/last.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/last.png
diff --git a/installer/resources/themes/snark/vanilla/images/next.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/next.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/next.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/next.png
diff --git a/installer/resources/themes/snark/vanilla/images/nopeers.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/nopeers.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/nopeers.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/nopeers.png
diff --git a/installer/resources/themes/snark/vanilla/images/nuke.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/nuke.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/nuke.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/nuke.png
diff --git a/installer/resources/themes/snark/vanilla/images/peer.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/peer.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/peer.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/peer.png
diff --git a/installer/resources/themes/snark/vanilla/images/previous.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/previous.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/previous.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/previous.png
diff --git a/installer/resources/themes/snark/vanilla/images/priority.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/priority.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/priority.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/priority.png
diff --git a/installer/resources/themes/snark/vanilla/images/progressbar.gif b/apps/routerconsole/jsp/themes/snark/vanilla/images/progressbar.gif
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/progressbar.gif
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/progressbar.gif
diff --git a/installer/resources/themes/snark/vanilla/images/rateme.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/rateme.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/rateme.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/rateme.png
diff --git a/installer/resources/themes/snark/vanilla/images/recheck.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/recheck.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/recheck.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/recheck.png
diff --git a/installer/resources/themes/snark/vanilla/images/remove.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/remove.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/remove.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/remove.png
diff --git a/installer/resources/themes/snark/vanilla/images/restore.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/restore.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/restore.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/restore.png
diff --git a/installer/resources/themes/snark/vanilla/images/seeding.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/seeding.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/seeding.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/seeding.png
diff --git a/installer/resources/themes/snark/vanilla/images/showpeers.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/showpeers.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/showpeers.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/showpeers.png
diff --git a/installer/resources/themes/snark/vanilla/images/size.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/size.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/size.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/size.png
diff --git a/installer/resources/themes/snark/vanilla/images/snark_add.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/snark_add.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/snark_add.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/snark_add.png
diff --git a/installer/resources/themes/snark/vanilla/images/snark_create.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/snark_create.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/snark_create.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/snark_create.png
diff --git a/installer/resources/themes/snark/vanilla/images/stalled.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/stalled.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/stalled.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/stalled.png
diff --git a/installer/resources/themes/snark/vanilla/images/start.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/start.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/start.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/start.png
diff --git a/installer/resources/themes/snark/vanilla/images/start_all.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/start_all.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/start_all.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/start_all.png
diff --git a/installer/resources/themes/snark/vanilla/images/status.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/status.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/status.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/status.png
diff --git a/installer/resources/themes/snark/vanilla/images/stop.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/stop.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/stop.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/stop.png
diff --git a/installer/resources/themes/snark/vanilla/images/stop_all.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/stop_all.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/stop_all.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/stop_all.png
diff --git a/installer/resources/themes/snark/vanilla/images/stopped.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/stopped.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/stopped.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/stopped.png
diff --git a/installer/resources/themes/snark/vanilla/images/tile2.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/tile2.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/tile2.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/tile2.png
diff --git a/installer/resources/themes/snark/vanilla/images/torrent.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/torrent.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/torrent.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/torrent.png
diff --git a/installer/resources/themes/snark/vanilla/images/torrent0.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/torrent0.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/torrent0.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/torrent0.png
diff --git a/installer/resources/themes/snark/vanilla/images/trackererror.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/trackererror.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/trackererror.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/trackererror.png
diff --git a/installer/resources/themes/snark/vanilla/images/up.png b/apps/routerconsole/jsp/themes/snark/vanilla/images/up.png
similarity index 100%
rename from installer/resources/themes/snark/vanilla/images/up.png
rename to apps/routerconsole/jsp/themes/snark/vanilla/images/up.png
diff --git a/installer/resources/themes/snark/vanilla/nocollapse.css b/apps/routerconsole/jsp/themes/snark/vanilla/nocollapse.css
similarity index 100%
rename from installer/resources/themes/snark/vanilla/nocollapse.css
rename to apps/routerconsole/jsp/themes/snark/vanilla/nocollapse.css
diff --git a/installer/resources/themes/snark/vanilla/snark.css b/apps/routerconsole/jsp/themes/snark/vanilla/snark.css
similarity index 100%
rename from installer/resources/themes/snark/vanilla/snark.css
rename to apps/routerconsole/jsp/themes/snark/vanilla/snark.css
diff --git a/installer/resources/themes/susidns/dark/images/bin.png b/apps/routerconsole/jsp/themes/susidns/dark/images/bin.png
similarity index 100%
rename from installer/resources/themes/susidns/dark/images/bin.png
rename to apps/routerconsole/jsp/themes/susidns/dark/images/bin.png
diff --git a/installer/resources/themes/susidns/dark/susidns.css b/apps/routerconsole/jsp/themes/susidns/dark/susidns.css
similarity index 100%
rename from installer/resources/themes/susidns/dark/susidns.css
rename to apps/routerconsole/jsp/themes/susidns/dark/susidns.css
diff --git a/installer/resources/themes/susidns/images/abook.png b/apps/routerconsole/jsp/themes/susidns/images/abook.png
similarity index 100%
rename from installer/resources/themes/susidns/images/abook.png
rename to apps/routerconsole/jsp/themes/susidns/images/abook.png
diff --git a/installer/resources/themes/susidns/images/addressbook.png b/apps/routerconsole/jsp/themes/susidns/images/addressbook.png
similarity index 100%
rename from installer/resources/themes/susidns/images/addressbook.png
rename to apps/routerconsole/jsp/themes/susidns/images/addressbook.png
diff --git a/installer/resources/themes/susidns/images/configure_24.png b/apps/routerconsole/jsp/themes/susidns/images/configure_24.png
similarity index 100%
rename from installer/resources/themes/susidns/images/configure_24.png
rename to apps/routerconsole/jsp/themes/susidns/images/configure_24.png
diff --git a/installer/resources/themes/susidns/images/drive.png b/apps/routerconsole/jsp/themes/susidns/images/drive.png
similarity index 100%
rename from installer/resources/themes/susidns/images/drive.png
rename to apps/routerconsole/jsp/themes/susidns/images/drive.png
diff --git a/installer/resources/themes/susidns/images/how.png b/apps/routerconsole/jsp/themes/susidns/images/how.png
similarity index 100%
rename from installer/resources/themes/susidns/images/how.png
rename to apps/routerconsole/jsp/themes/susidns/images/how.png
diff --git a/installer/resources/themes/susidns/images/overview.png b/apps/routerconsole/jsp/themes/susidns/images/overview.png
similarity index 100%
rename from installer/resources/themes/susidns/images/overview.png
rename to apps/routerconsole/jsp/themes/susidns/images/overview.png
diff --git a/installer/resources/themes/susidns/images/subs.png b/apps/routerconsole/jsp/themes/susidns/images/subs.png
similarity index 100%
rename from installer/resources/themes/susidns/images/subs.png
rename to apps/routerconsole/jsp/themes/susidns/images/subs.png
diff --git a/installer/resources/themes/susidns/images/subs_24.png b/apps/routerconsole/jsp/themes/susidns/images/subs_24.png
similarity index 100%
rename from installer/resources/themes/susidns/images/subs_24.png
rename to apps/routerconsole/jsp/themes/susidns/images/subs_24.png
diff --git a/installer/resources/themes/susidns/light/susidns.css b/apps/routerconsole/jsp/themes/susidns/light/susidns.css
similarity index 100%
rename from installer/resources/themes/susidns/light/susidns.css
rename to apps/routerconsole/jsp/themes/susidns/light/susidns.css
diff --git a/installer/resources/themes/susimail/dark/images/3down.png b/apps/routerconsole/jsp/themes/susimail/dark/images/3down.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/3down.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/3down.png
diff --git a/installer/resources/themes/susimail/dark/images/3up.png b/apps/routerconsole/jsp/themes/susimail/dark/images/3up.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/3up.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/3up.png
diff --git a/installer/resources/themes/susimail/dark/images/account.png b/apps/routerconsole/jsp/themes/susimail/dark/images/account.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/account.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/account.png
diff --git a/installer/resources/themes/susimail/dark/images/edit.png b/apps/routerconsole/jsp/themes/susimail/dark/images/edit.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/edit.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/edit.png
diff --git a/installer/resources/themes/susimail/dark/images/first.png b/apps/routerconsole/jsp/themes/susimail/dark/images/first.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/first.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/first.png
diff --git a/installer/resources/themes/susimail/dark/images/first_active.png b/apps/routerconsole/jsp/themes/susimail/dark/images/first_active.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/first_active.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/first_active.png
diff --git a/installer/resources/themes/susimail/dark/images/first_disabled.png b/apps/routerconsole/jsp/themes/susimail/dark/images/first_disabled.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/first_disabled.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/first_disabled.png
diff --git a/installer/resources/themes/susimail/dark/images/first_hover.png b/apps/routerconsole/jsp/themes/susimail/dark/images/first_hover.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/first_hover.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/first_hover.png
diff --git a/installer/resources/themes/susimail/dark/images/folder.png b/apps/routerconsole/jsp/themes/susimail/dark/images/folder.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/folder.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/folder.png
diff --git a/installer/resources/themes/susimail/dark/images/help.png b/apps/routerconsole/jsp/themes/susimail/dark/images/help.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/help.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/help.png
diff --git a/installer/resources/themes/susimail/dark/images/last.png b/apps/routerconsole/jsp/themes/susimail/dark/images/last.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/last.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/last.png
diff --git a/installer/resources/themes/susimail/dark/images/last_active.png b/apps/routerconsole/jsp/themes/susimail/dark/images/last_active.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/last_active.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/last_active.png
diff --git a/installer/resources/themes/susimail/dark/images/last_disabled.png b/apps/routerconsole/jsp/themes/susimail/dark/images/last_disabled.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/last_disabled.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/last_disabled.png
diff --git a/installer/resources/themes/susimail/dark/images/last_hover.png b/apps/routerconsole/jsp/themes/susimail/dark/images/last_hover.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/last_hover.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/last_hover.png
diff --git a/installer/resources/themes/susimail/dark/images/login.png b/apps/routerconsole/jsp/themes/susimail/dark/images/login.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/login.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/login.png
diff --git a/installer/resources/themes/susimail/dark/images/logout.png b/apps/routerconsole/jsp/themes/susimail/dark/images/logout.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/logout.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/logout.png
diff --git a/installer/resources/themes/susimail/dark/images/mail.png b/apps/routerconsole/jsp/themes/susimail/dark/images/mail.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/mail.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/mail.png
diff --git a/installer/resources/themes/susimail/dark/images/next.png b/apps/routerconsole/jsp/themes/susimail/dark/images/next.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/next.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/next.png
diff --git a/installer/resources/themes/susimail/dark/images/next_active.png b/apps/routerconsole/jsp/themes/susimail/dark/images/next_active.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/next_active.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/next_active.png
diff --git a/installer/resources/themes/susimail/dark/images/next_disabled.png b/apps/routerconsole/jsp/themes/susimail/dark/images/next_disabled.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/next_disabled.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/next_disabled.png
diff --git a/installer/resources/themes/susimail/dark/images/next_hover.png b/apps/routerconsole/jsp/themes/susimail/dark/images/next_hover.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/next_hover.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/next_hover.png
diff --git a/installer/resources/themes/susimail/dark/images/offline.png b/apps/routerconsole/jsp/themes/susimail/dark/images/offline.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/offline.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/offline.png
diff --git a/installer/resources/themes/susimail/dark/images/previous.png b/apps/routerconsole/jsp/themes/susimail/dark/images/previous.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/previous.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/previous.png
diff --git a/installer/resources/themes/susimail/dark/images/previous_active.png b/apps/routerconsole/jsp/themes/susimail/dark/images/previous_active.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/previous_active.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/previous_active.png
diff --git a/installer/resources/themes/susimail/dark/images/previous_disabled.png b/apps/routerconsole/jsp/themes/susimail/dark/images/previous_disabled.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/previous_disabled.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/previous_disabled.png
diff --git a/installer/resources/themes/susimail/dark/images/previous_hover.png b/apps/routerconsole/jsp/themes/susimail/dark/images/previous_hover.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/previous_hover.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/previous_hover.png
diff --git a/installer/resources/themes/susimail/dark/images/refresh.png b/apps/routerconsole/jsp/themes/susimail/dark/images/refresh.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/refresh.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/refresh.png
diff --git a/installer/resources/themes/susimail/dark/images/settings.png b/apps/routerconsole/jsp/themes/susimail/dark/images/settings.png
similarity index 100%
rename from installer/resources/themes/susimail/dark/images/settings.png
rename to apps/routerconsole/jsp/themes/susimail/dark/images/settings.png
diff --git a/installer/resources/themes/susimail/dark/mobile.css b/apps/routerconsole/jsp/themes/susimail/dark/mobile.css
similarity index 100%
rename from installer/resources/themes/susimail/dark/mobile.css
rename to apps/routerconsole/jsp/themes/susimail/dark/mobile.css
diff --git a/installer/resources/themes/susimail/dark/susimail.css b/apps/routerconsole/jsp/themes/susimail/dark/susimail.css
similarity index 100%
rename from installer/resources/themes/susimail/dark/susimail.css
rename to apps/routerconsole/jsp/themes/susimail/dark/susimail.css
diff --git a/installer/resources/themes/susimail/images/all.png b/apps/routerconsole/jsp/themes/susimail/images/all.png
similarity index 100%
rename from installer/resources/themes/susimail/images/all.png
rename to apps/routerconsole/jsp/themes/susimail/images/all.png
diff --git a/installer/resources/themes/susimail/images/attach.png b/apps/routerconsole/jsp/themes/susimail/images/attach.png
similarity index 100%
rename from installer/resources/themes/susimail/images/attach.png
rename to apps/routerconsole/jsp/themes/susimail/images/attach.png
diff --git a/installer/resources/themes/susimail/images/compose.png b/apps/routerconsole/jsp/themes/susimail/images/compose.png
similarity index 100%
rename from installer/resources/themes/susimail/images/compose.png
rename to apps/routerconsole/jsp/themes/susimail/images/compose.png
diff --git a/installer/resources/themes/susimail/images/compose_hover.png b/apps/routerconsole/jsp/themes/susimail/images/compose_hover.png
similarity index 100%
rename from installer/resources/themes/susimail/images/compose_hover.png
rename to apps/routerconsole/jsp/themes/susimail/images/compose_hover.png
diff --git a/installer/resources/themes/susimail/images/first.png b/apps/routerconsole/jsp/themes/susimail/images/first.png
similarity index 100%
rename from installer/resources/themes/susimail/images/first.png
rename to apps/routerconsole/jsp/themes/susimail/images/first.png
diff --git a/installer/resources/themes/susimail/images/folder-open.png b/apps/routerconsole/jsp/themes/susimail/images/folder-open.png
similarity index 100%
rename from installer/resources/themes/susimail/images/folder-open.png
rename to apps/routerconsole/jsp/themes/susimail/images/folder-open.png
diff --git a/installer/resources/themes/susimail/images/folder.png b/apps/routerconsole/jsp/themes/susimail/images/folder.png
similarity index 100%
rename from installer/resources/themes/susimail/images/folder.png
rename to apps/routerconsole/jsp/themes/susimail/images/folder.png
diff --git a/installer/resources/themes/susimail/images/forward.png b/apps/routerconsole/jsp/themes/susimail/images/forward.png
similarity index 100%
rename from installer/resources/themes/susimail/images/forward.png
rename to apps/routerconsole/jsp/themes/susimail/images/forward.png
diff --git a/installer/resources/themes/susimail/images/last.png b/apps/routerconsole/jsp/themes/susimail/images/last.png
similarity index 100%
rename from installer/resources/themes/susimail/images/last.png
rename to apps/routerconsole/jsp/themes/susimail/images/last.png
diff --git a/installer/resources/themes/susimail/images/login.png b/apps/routerconsole/jsp/themes/susimail/images/login.png
similarity index 100%
rename from installer/resources/themes/susimail/images/login.png
rename to apps/routerconsole/jsp/themes/susimail/images/login.png
diff --git a/installer/resources/themes/susimail/images/login_hover.png b/apps/routerconsole/jsp/themes/susimail/images/login_hover.png
similarity index 100%
rename from installer/resources/themes/susimail/images/login_hover.png
rename to apps/routerconsole/jsp/themes/susimail/images/login_hover.png
diff --git a/installer/resources/themes/susimail/images/logout.png b/apps/routerconsole/jsp/themes/susimail/images/logout.png
similarity index 100%
rename from installer/resources/themes/susimail/images/logout.png
rename to apps/routerconsole/jsp/themes/susimail/images/logout.png
diff --git a/installer/resources/themes/susimail/images/logout_hover.png b/apps/routerconsole/jsp/themes/susimail/images/logout_hover.png
similarity index 100%
rename from installer/resources/themes/susimail/images/logout_hover.png
rename to apps/routerconsole/jsp/themes/susimail/images/logout_hover.png
diff --git a/installer/resources/themes/susimail/images/next.png b/apps/routerconsole/jsp/themes/susimail/images/next.png
similarity index 100%
rename from installer/resources/themes/susimail/images/next.png
rename to apps/routerconsole/jsp/themes/susimail/images/next.png
diff --git a/installer/resources/themes/susimail/images/none.png b/apps/routerconsole/jsp/themes/susimail/images/none.png
similarity index 100%
rename from installer/resources/themes/susimail/images/none.png
rename to apps/routerconsole/jsp/themes/susimail/images/none.png
diff --git a/installer/resources/themes/susimail/images/offline.png b/apps/routerconsole/jsp/themes/susimail/images/offline.png
similarity index 100%
rename from installer/resources/themes/susimail/images/offline.png
rename to apps/routerconsole/jsp/themes/susimail/images/offline.png
diff --git a/installer/resources/themes/susimail/images/offline_hover.png b/apps/routerconsole/jsp/themes/susimail/images/offline_hover.png
similarity index 100%
rename from installer/resources/themes/susimail/images/offline_hover.png
rename to apps/routerconsole/jsp/themes/susimail/images/offline_hover.png
diff --git a/installer/resources/themes/susimail/images/previous.png b/apps/routerconsole/jsp/themes/susimail/images/previous.png
similarity index 100%
rename from installer/resources/themes/susimail/images/previous.png
rename to apps/routerconsole/jsp/themes/susimail/images/previous.png
diff --git a/installer/resources/themes/susimail/images/reply-all.png b/apps/routerconsole/jsp/themes/susimail/images/reply-all.png
similarity index 100%
rename from installer/resources/themes/susimail/images/reply-all.png
rename to apps/routerconsole/jsp/themes/susimail/images/reply-all.png
diff --git a/installer/resources/themes/susimail/images/reply.png b/apps/routerconsole/jsp/themes/susimail/images/reply.png
similarity index 100%
rename from installer/resources/themes/susimail/images/reply.png
rename to apps/routerconsole/jsp/themes/susimail/images/reply.png
diff --git a/installer/resources/themes/susimail/images/save.png b/apps/routerconsole/jsp/themes/susimail/images/save.png
similarity index 100%
rename from installer/resources/themes/susimail/images/save.png
rename to apps/routerconsole/jsp/themes/susimail/images/save.png
diff --git a/installer/resources/themes/susimail/images/save_hover.png b/apps/routerconsole/jsp/themes/susimail/images/save_hover.png
similarity index 100%
rename from installer/resources/themes/susimail/images/save_hover.png
rename to apps/routerconsole/jsp/themes/susimail/images/save_hover.png
diff --git a/installer/resources/themes/susimail/images/selection.png b/apps/routerconsole/jsp/themes/susimail/images/selection.png
similarity index 100%
rename from installer/resources/themes/susimail/images/selection.png
rename to apps/routerconsole/jsp/themes/susimail/images/selection.png
diff --git a/installer/resources/themes/susimail/images/send.png b/apps/routerconsole/jsp/themes/susimail/images/send.png
similarity index 100%
rename from installer/resources/themes/susimail/images/send.png
rename to apps/routerconsole/jsp/themes/susimail/images/send.png
diff --git a/installer/resources/themes/susimail/images/send_hover.png b/apps/routerconsole/jsp/themes/susimail/images/send_hover.png
similarity index 100%
rename from installer/resources/themes/susimail/images/send_hover.png
rename to apps/routerconsole/jsp/themes/susimail/images/send_hover.png
diff --git a/installer/resources/themes/susimail/images/status.png b/apps/routerconsole/jsp/themes/susimail/images/status.png
similarity index 100%
rename from installer/resources/themes/susimail/images/status.png
rename to apps/routerconsole/jsp/themes/susimail/images/status.png
diff --git a/installer/resources/themes/susimail/images/susimail.png b/apps/routerconsole/jsp/themes/susimail/images/susimail.png
similarity index 100%
rename from installer/resources/themes/susimail/images/susimail.png
rename to apps/routerconsole/jsp/themes/susimail/images/susimail.png
diff --git a/installer/resources/themes/susimail/light/images/3down.png b/apps/routerconsole/jsp/themes/susimail/light/images/3down.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/3down.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/3down.png
diff --git a/installer/resources/themes/susimail/light/images/3up.png b/apps/routerconsole/jsp/themes/susimail/light/images/3up.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/3up.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/3up.png
diff --git a/installer/resources/themes/susimail/light/images/account.png b/apps/routerconsole/jsp/themes/susimail/light/images/account.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/account.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/account.png
diff --git a/installer/resources/themes/susimail/light/images/book.png b/apps/routerconsole/jsp/themes/susimail/light/images/book.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/book.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/book.png
diff --git a/installer/resources/themes/susimail/light/images/edit.png b/apps/routerconsole/jsp/themes/susimail/light/images/edit.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/edit.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/edit.png
diff --git a/installer/resources/themes/susimail/light/images/folder.png b/apps/routerconsole/jsp/themes/susimail/light/images/folder.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/folder.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/folder.png
diff --git a/installer/resources/themes/susimail/light/images/help.png b/apps/routerconsole/jsp/themes/susimail/light/images/help.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/help.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/help.png
diff --git a/installer/resources/themes/susimail/light/images/login.png b/apps/routerconsole/jsp/themes/susimail/light/images/login.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/login.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/login.png
diff --git a/installer/resources/themes/susimail/light/images/logout.png b/apps/routerconsole/jsp/themes/susimail/light/images/logout.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/logout.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/logout.png
diff --git a/installer/resources/themes/susimail/light/images/offline.png b/apps/routerconsole/jsp/themes/susimail/light/images/offline.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/offline.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/offline.png
diff --git a/installer/resources/themes/susimail/light/images/refresh.png b/apps/routerconsole/jsp/themes/susimail/light/images/refresh.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/refresh.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/refresh.png
diff --git a/installer/resources/themes/susimail/light/images/settings.png b/apps/routerconsole/jsp/themes/susimail/light/images/settings.png
similarity index 100%
rename from installer/resources/themes/susimail/light/images/settings.png
rename to apps/routerconsole/jsp/themes/susimail/light/images/settings.png
diff --git a/installer/resources/themes/susimail/light/mobile.css b/apps/routerconsole/jsp/themes/susimail/light/mobile.css
similarity index 100%
rename from installer/resources/themes/susimail/light/mobile.css
rename to apps/routerconsole/jsp/themes/susimail/light/mobile.css
diff --git a/installer/resources/themes/susimail/light/susimail.css b/apps/routerconsole/jsp/themes/susimail/light/susimail.css
similarity index 100%
rename from installer/resources/themes/susimail/light/susimail.css
rename to apps/routerconsole/jsp/themes/susimail/light/susimail.css