diff --git a/deluge/ui/webui/webui_plugin/LICENSE b/deluge/ui/webui2/LICENSE
similarity index 100%
rename from deluge/ui/webui/webui_plugin/LICENSE
rename to deluge/ui/webui2/LICENSE
diff --git a/deluge/ui/webui/webui_plugin/TODO b/deluge/ui/webui2/TODO
similarity index 100%
rename from deluge/ui/webui/webui_plugin/TODO
rename to deluge/ui/webui2/TODO
diff --git a/deluge/ui/webui/webui_plugin/__init__.py b/deluge/ui/webui2/__init__.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/__init__.py
rename to deluge/ui/webui2/__init__.py
diff --git a/deluge/ui/webui/webui_plugin/config.py b/deluge/ui/webui2/config.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/config.py
rename to deluge/ui/webui2/config.py
diff --git a/deluge/ui/webui/webui_plugin/config_tabs_deluge.py b/deluge/ui/webui2/config_tabs_deluge.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/config_tabs_deluge.py
rename to deluge/ui/webui2/config_tabs_deluge.py
diff --git a/deluge/ui/webui/webui_plugin/config_tabs_webui.py b/deluge/ui/webui2/config_tabs_webui.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/config_tabs_webui.py
rename to deluge/ui/webui2/config_tabs_webui.py
diff --git a/deluge/ui/webui/webui_plugin/dbus_interface.py b/deluge/ui/webui2/dbus_interface.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/dbus_interface.py
rename to deluge/ui/webui2/dbus_interface.py
diff --git a/deluge/ui/webui/webui_plugin/debugerror.py b/deluge/ui/webui2/debugerror.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/debugerror.py
rename to deluge/ui/webui2/debugerror.py
diff --git a/deluge/ui/webui/webui_plugin/deluge_webserver.py b/deluge/ui/webui2/deluge_webserver.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/deluge_webserver.py
rename to deluge/ui/webui2/deluge_webserver.py
diff --git a/deluge/ui/webui/webui_plugin/json_api.py b/deluge/ui/webui2/json_api.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/json_api.py
rename to deluge/ui/webui2/json_api.py
diff --git a/deluge/ui/webui/webui_plugin/lib/__init__.py b/deluge/ui/webui2/lib/__init__.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/__init__.py
rename to deluge/ui/webui2/lib/__init__.py
diff --git a/deluge/ui/webui/webui_plugin/lib/gtk_cherrypy_wsgiserver.py b/deluge/ui/webui2/lib/gtk_cherrypy_wsgiserver.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/gtk_cherrypy_wsgiserver.py
rename to deluge/ui/webui2/lib/gtk_cherrypy_wsgiserver.py
diff --git a/deluge/ui/webui/webui_plugin/lib/newforms/LICENSE b/deluge/ui/webui2/lib/newforms/LICENSE
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/newforms/LICENSE
rename to deluge/ui/webui2/lib/newforms/LICENSE
diff --git a/deluge/ui/webui/webui_plugin/lib/newforms/__init__.py b/deluge/ui/webui2/lib/newforms/__init__.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/newforms/__init__.py
rename to deluge/ui/webui2/lib/newforms/__init__.py
diff --git a/deluge/ui/webui/webui_plugin/lib/newforms/fields.py b/deluge/ui/webui2/lib/newforms/fields.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/newforms/fields.py
rename to deluge/ui/webui2/lib/newforms/fields.py
diff --git a/deluge/ui/webui/webui_plugin/lib/newforms/forms.py b/deluge/ui/webui2/lib/newforms/forms.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/newforms/forms.py
rename to deluge/ui/webui2/lib/newforms/forms.py
diff --git a/deluge/ui/webui/webui_plugin/lib/newforms/util.py b/deluge/ui/webui2/lib/newforms/util.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/newforms/util.py
rename to deluge/ui/webui2/lib/newforms/util.py
diff --git a/deluge/ui/webui/webui_plugin/lib/newforms/utils/__init__.py b/deluge/ui/webui2/lib/newforms/utils/__init__.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/newforms/utils/__init__.py
rename to deluge/ui/webui2/lib/newforms/utils/__init__.py
diff --git a/deluge/ui/webui/webui_plugin/lib/newforms/utils/datastructures.py b/deluge/ui/webui2/lib/newforms/utils/datastructures.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/newforms/utils/datastructures.py
rename to deluge/ui/webui2/lib/newforms/utils/datastructures.py
diff --git a/deluge/ui/webui/webui_plugin/lib/newforms/utils/html.py b/deluge/ui/webui2/lib/newforms/utils/html.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/newforms/utils/html.py
rename to deluge/ui/webui2/lib/newforms/utils/html.py
diff --git a/deluge/ui/webui/webui_plugin/lib/newforms/widgets.py b/deluge/ui/webui2/lib/newforms/widgets.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/newforms/widgets.py
rename to deluge/ui/webui2/lib/newforms/widgets.py
diff --git a/deluge/ui/webui/webui_plugin/lib/newforms_plus.py b/deluge/ui/webui2/lib/newforms_plus.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/newforms_plus.py
rename to deluge/ui/webui2/lib/newforms_plus.py
diff --git a/deluge/ui/webui/webui_plugin/lib/pythonize.py b/deluge/ui/webui2/lib/pythonize.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/pythonize.py
rename to deluge/ui/webui2/lib/pythonize.py
diff --git a/deluge/ui/webui/webui_plugin/lib/readme.txt b/deluge/ui/webui2/lib/readme.txt
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/readme.txt
rename to deluge/ui/webui2/lib/readme.txt
diff --git a/deluge/ui/webui/webui_plugin/lib/static_handler.py b/deluge/ui/webui2/lib/static_handler.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/static_handler.py
rename to deluge/ui/webui2/lib/static_handler.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/Dependency-not-really part of webui.txt b/deluge/ui/webui2/lib/webpy022/Dependency-not-really part of webui.txt
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/Dependency-not-really part of webui.txt
rename to deluge/ui/webui2/lib/webpy022/Dependency-not-really part of webui.txt
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/__init__.py b/deluge/ui/webui2/lib/webpy022/__init__.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/__init__.py
rename to deluge/ui/webui2/lib/webpy022/__init__.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/changes.txt b/deluge/ui/webui2/lib/webpy022/changes.txt
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/changes.txt
rename to deluge/ui/webui2/lib/webpy022/changes.txt
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/cheetah.py b/deluge/ui/webui2/lib/webpy022/cheetah.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/cheetah.py
rename to deluge/ui/webui2/lib/webpy022/cheetah.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/db.py b/deluge/ui/webui2/lib/webpy022/db.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/db.py
rename to deluge/ui/webui2/lib/webpy022/db.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/debugerror.py b/deluge/ui/webui2/lib/webpy022/debugerror.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/debugerror.py
rename to deluge/ui/webui2/lib/webpy022/debugerror.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/form.py b/deluge/ui/webui2/lib/webpy022/form.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/form.py
rename to deluge/ui/webui2/lib/webpy022/form.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/http.py b/deluge/ui/webui2/lib/webpy022/http.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/http.py
rename to deluge/ui/webui2/lib/webpy022/http.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/httpserver.py b/deluge/ui/webui2/lib/webpy022/httpserver.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/httpserver.py
rename to deluge/ui/webui2/lib/webpy022/httpserver.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/net.py b/deluge/ui/webui2/lib/webpy022/net.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/net.py
rename to deluge/ui/webui2/lib/webpy022/net.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/request.py b/deluge/ui/webui2/lib/webpy022/request.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/request.py
rename to deluge/ui/webui2/lib/webpy022/request.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/template.py b/deluge/ui/webui2/lib/webpy022/template.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/template.py
rename to deluge/ui/webui2/lib/webpy022/template.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/utils.py b/deluge/ui/webui2/lib/webpy022/utils.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/utils.py
rename to deluge/ui/webui2/lib/webpy022/utils.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/webapi.py b/deluge/ui/webui2/lib/webpy022/webapi.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/webapi.py
rename to deluge/ui/webui2/lib/webpy022/webapi.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/wsgi.py b/deluge/ui/webui2/lib/webpy022/wsgi.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/wsgi.py
rename to deluge/ui/webui2/lib/webpy022/wsgi.py
diff --git a/deluge/ui/webui/webui_plugin/lib/webpy022/wsgiserver/__init__.py b/deluge/ui/webui2/lib/webpy022/wsgiserver/__init__.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/lib/webpy022/wsgiserver/__init__.py
rename to deluge/ui/webui2/lib/webpy022/wsgiserver/__init__.py
diff --git a/deluge/ui/webui/webui_plugin/menu_manager.py b/deluge/ui/webui2/menu_manager.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/menu_manager.py
rename to deluge/ui/webui2/menu_manager.py
diff --git a/deluge/ui/webui/webui_plugin/page_decorators.py b/deluge/ui/webui2/page_decorators.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/page_decorators.py
rename to deluge/ui/webui2/page_decorators.py
diff --git a/deluge/ui/webui/webui_plugin/pages.py b/deluge/ui/webui2/pages.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/pages.py
rename to deluge/ui/webui2/pages.py
diff --git a/deluge/ui/webui/webui_plugin/plugin_api.py b/deluge/ui/webui2/plugin_api.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/plugin_api.py
rename to deluge/ui/webui2/plugin_api.py
diff --git a/deluge/ui/webui/webui_plugin/render.py b/deluge/ui/webui2/render.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/render.py
rename to deluge/ui/webui2/render.py
diff --git a/deluge/ui/webui/webui_plugin/revno b/deluge/ui/webui2/revno
similarity index 100%
rename from deluge/ui/webui/webui_plugin/revno
rename to deluge/ui/webui2/revno
diff --git a/deluge/ui/webui/webui_plugin/run_webserver06 b/deluge/ui/webui2/run_webserver06
similarity index 100%
rename from deluge/ui/webui/webui_plugin/run_webserver06
rename to deluge/ui/webui2/run_webserver06
diff --git a/deluge/ui/webui/webui_plugin/scripts/add_torrent_to_deluge_webui b/deluge/ui/webui2/scripts/add_torrent_to_deluge_webui
similarity index 100%
rename from deluge/ui/webui/webui_plugin/scripts/add_torrent_to_deluge_webui
rename to deluge/ui/webui2/scripts/add_torrent_to_deluge_webui
diff --git a/deluge/ui/webui/webui_plugin/scripts/add_torrents_to_deluge.user.js b/deluge/ui/webui2/scripts/add_torrents_to_deluge.user.js
similarity index 100%
rename from deluge/ui/webui/webui_plugin/scripts/add_torrents_to_deluge.user.js
rename to deluge/ui/webui2/scripts/add_torrents_to_deluge.user.js
diff --git a/deluge/ui/webui/webui_plugin/scripts/build_webui_tarball.sh b/deluge/ui/webui2/scripts/build_webui_tarball.sh
similarity index 100%
rename from deluge/ui/webui/webui_plugin/scripts/build_webui_tarball.sh
rename to deluge/ui/webui2/scripts/build_webui_tarball.sh
diff --git a/deluge/ui/webui/webui_plugin/scripts/curl-example b/deluge/ui/webui2/scripts/curl-example
similarity index 100%
rename from deluge/ui/webui/webui_plugin/scripts/curl-example
rename to deluge/ui/webui2/scripts/curl-example
diff --git a/deluge/ui/webui/webui_plugin/scripts/extract_template_strings.py b/deluge/ui/webui2/scripts/extract_template_strings.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/scripts/extract_template_strings.py
rename to deluge/ui/webui2/scripts/extract_template_strings.py
diff --git a/deluge/ui/webui/webui_plugin/scripts/template_strings.py b/deluge/ui/webui2/scripts/template_strings.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/scripts/template_strings.py
rename to deluge/ui/webui2/scripts/template_strings.py
diff --git a/deluge/ui/webui/webui_plugin/ssl/deluge.key b/deluge/ui/webui2/ssl/deluge.key
similarity index 100%
rename from deluge/ui/webui/webui_plugin/ssl/deluge.key
rename to deluge/ui/webui2/ssl/deluge.key
diff --git a/deluge/ui/webui/webui_plugin/ssl/deluge.pem b/deluge/ui/webui2/ssl/deluge.pem
similarity index 100%
rename from deluge/ui/webui/webui_plugin/ssl/deluge.pem
rename to deluge/ui/webui2/ssl/deluge.pem
diff --git a/deluge/ui/webui/webui_plugin/static/images/deluge_icon.gif b/deluge/ui/webui2/static/images/deluge_icon.gif
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/deluge_icon.gif
rename to deluge/ui/webui2/static/images/deluge_icon.gif
diff --git a/deluge/ui/webui/webui_plugin/static/images/dht16.png b/deluge/ui/webui2/static/images/dht16.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/dht16.png
rename to deluge/ui/webui2/static/images/dht16.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/downloading16.png b/deluge/ui/webui2/static/images/downloading16.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/downloading16.png
rename to deluge/ui/webui2/static/images/downloading16.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/inactive16.png b/deluge/ui/webui2/static/images/inactive16.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/inactive16.png
rename to deluge/ui/webui2/static/images/inactive16.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/seeding16.png b/deluge/ui/webui2/static/images/seeding16.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/seeding16.png
rename to deluge/ui/webui2/static/images/seeding16.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/simple_bg.jpg b/deluge/ui/webui2/static/images/simple_bg.jpg
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/simple_bg.jpg
rename to deluge/ui/webui2/static/images/simple_bg.jpg
diff --git a/deluge/ui/webui/webui_plugin/static/images/simple_line.jpg b/deluge/ui/webui2/static/images/simple_line.jpg
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/simple_line.jpg
rename to deluge/ui/webui2/static/images/simple_line.jpg
diff --git a/deluge/ui/webui/webui_plugin/static/images/simple_logo.jpg b/deluge/ui/webui2/static/images/simple_logo.jpg
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/simple_logo.jpg
rename to deluge/ui/webui2/static/images/simple_logo.jpg
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/connections.png b/deluge/ui/webui2/static/images/tango/connections.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/connections.png
rename to deluge/ui/webui2/static/images/tango/connections.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/details.png b/deluge/ui/webui2/static/images/tango/details.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/details.png
rename to deluge/ui/webui2/static/images/tango/details.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/down.png b/deluge/ui/webui2/static/images/tango/down.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/down.png
rename to deluge/ui/webui2/static/images/tango/down.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/list-add.png b/deluge/ui/webui2/static/images/tango/list-add.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/list-add.png
rename to deluge/ui/webui2/static/images/tango/list-add.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/list-remove.png b/deluge/ui/webui2/static/images/tango/list-remove.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/list-remove.png
rename to deluge/ui/webui2/static/images/tango/list-remove.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/move.png b/deluge/ui/webui2/static/images/tango/move.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/move.png
rename to deluge/ui/webui2/static/images/tango/move.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/pause.png b/deluge/ui/webui2/static/images/tango/pause.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/pause.png
rename to deluge/ui/webui2/static/images/tango/pause.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/preferences-system.png b/deluge/ui/webui2/static/images/tango/preferences-system.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/preferences-system.png
rename to deluge/ui/webui2/static/images/tango/preferences-system.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/process-stop.png b/deluge/ui/webui2/static/images/tango/process-stop.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/process-stop.png
rename to deluge/ui/webui2/static/images/tango/process-stop.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/queue-down.png b/deluge/ui/webui2/static/images/tango/queue-down.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/queue-down.png
rename to deluge/ui/webui2/static/images/tango/queue-down.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/queue-up.png b/deluge/ui/webui2/static/images/tango/queue-up.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/queue-up.png
rename to deluge/ui/webui2/static/images/tango/queue-up.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/start.png b/deluge/ui/webui2/static/images/tango/start.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/start.png
rename to deluge/ui/webui2/static/images/tango/start.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/stop.png b/deluge/ui/webui2/static/images/tango/stop.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/stop.png
rename to deluge/ui/webui2/static/images/tango/stop.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/system-log-out.png b/deluge/ui/webui2/static/images/tango/system-log-out.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/system-log-out.png
rename to deluge/ui/webui2/static/images/tango/system-log-out.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/up.png b/deluge/ui/webui2/static/images/tango/up.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/up.png
rename to deluge/ui/webui2/static/images/tango/up.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/user-trash.png b/deluge/ui/webui2/static/images/tango/user-trash.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/user-trash.png
rename to deluge/ui/webui2/static/images/tango/user-trash.png
diff --git a/deluge/ui/webui/webui_plugin/static/images/tango/view-refresh.png b/deluge/ui/webui2/static/images/tango/view-refresh.png
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/images/tango/view-refresh.png
rename to deluge/ui/webui2/static/images/tango/view-refresh.png
diff --git a/deluge/ui/webui/webui_plugin/static/simple_site_style.css b/deluge/ui/webui2/static/simple_site_style.css
similarity index 100%
rename from deluge/ui/webui/webui_plugin/static/simple_site_style.css
rename to deluge/ui/webui2/static/simple_site_style.css
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/header.html b/deluge/ui/webui2/templates/advanced/header.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/advanced/header.html
rename to deluge/ui/webui2/templates/advanced/header.html
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/index.html b/deluge/ui/webui2/templates/advanced/index.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/advanced/index.html
rename to deluge/ui/webui2/templates/advanced/index.html
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/part_categories.html b/deluge/ui/webui2/templates/advanced/part_categories.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/advanced/part_categories.html
rename to deluge/ui/webui2/templates/advanced/part_categories.html
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/part_stats.html b/deluge/ui/webui2/templates/advanced/part_stats.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/advanced/part_stats.html
rename to deluge/ui/webui2/templates/advanced/part_stats.html
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/part_tab_button.html b/deluge/ui/webui2/templates/advanced/part_tab_button.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/advanced/part_tab_button.html
rename to deluge/ui/webui2/templates/advanced/part_tab_button.html
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/part_tb_button.html b/deluge/ui/webui2/templates/advanced/part_tb_button.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/advanced/part_tb_button.html
rename to deluge/ui/webui2/templates/advanced/part_tb_button.html
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/static/advanced.css b/deluge/ui/webui2/templates/advanced/static/advanced.css
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/advanced/static/advanced.css
rename to deluge/ui/webui2/templates/advanced/static/advanced.css
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/static/deluge.js b/deluge/ui/webui2/templates/advanced/static/deluge.js
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/advanced/static/deluge.js
rename to deluge/ui/webui2/templates/advanced/static/deluge.js
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/static/scrolling_table.css b/deluge/ui/webui2/templates/advanced/static/scrolling_table.css
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/advanced/static/scrolling_table.css
rename to deluge/ui/webui2/templates/advanced/static/scrolling_table.css
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/torrent_info_inner.html b/deluge/ui/webui2/templates/advanced/torrent_info_inner.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/advanced/torrent_info_inner.html
rename to deluge/ui/webui2/templates/advanced/torrent_info_inner.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/about.html b/deluge/ui/webui2/templates/deluge/about.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/about.html
rename to deluge/ui/webui2/templates/deluge/about.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/admin_toolbar.html b/deluge/ui/webui2/templates/deluge/admin_toolbar.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/admin_toolbar.html
rename to deluge/ui/webui2/templates/deluge/admin_toolbar.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/authors.txt b/deluge/ui/webui2/templates/deluge/authors.txt
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/authors.txt
rename to deluge/ui/webui2/templates/deluge/authors.txt
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/config.html b/deluge/ui/webui2/templates/deluge/config.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/config.html
rename to deluge/ui/webui2/templates/deluge/config.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/connect.html b/deluge/ui/webui2/templates/deluge/connect.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/connect.html
rename to deluge/ui/webui2/templates/deluge/connect.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/error.html b/deluge/ui/webui2/templates/deluge/error.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/error.html
rename to deluge/ui/webui2/templates/deluge/error.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/footer.html b/deluge/ui/webui2/templates/deluge/footer.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/footer.html
rename to deluge/ui/webui2/templates/deluge/footer.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/header.html b/deluge/ui/webui2/templates/deluge/header.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/header.html
rename to deluge/ui/webui2/templates/deluge/header.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/index.html b/deluge/ui/webui2/templates/deluge/index.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/index.html
rename to deluge/ui/webui2/templates/deluge/index.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/login.html b/deluge/ui/webui2/templates/deluge/login.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/login.html
rename to deluge/ui/webui2/templates/deluge/login.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/part_button.html b/deluge/ui/webui2/templates/deluge/part_button.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/part_button.html
rename to deluge/ui/webui2/templates/deluge/part_button.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/part_stats.html b/deluge/ui/webui2/templates/deluge/part_stats.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/part_stats.html
rename to deluge/ui/webui2/templates/deluge/part_stats.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/refresh_form.html b/deluge/ui/webui2/templates/deluge/refresh_form.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/refresh_form.html
rename to deluge/ui/webui2/templates/deluge/refresh_form.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/sort_column_head.html b/deluge/ui/webui2/templates/deluge/sort_column_head.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/sort_column_head.html
rename to deluge/ui/webui2/templates/deluge/sort_column_head.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/tab_files.html b/deluge/ui/webui2/templates/deluge/tab_files.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/tab_files.html
rename to deluge/ui/webui2/templates/deluge/tab_files.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/tab_meta.html b/deluge/ui/webui2/templates/deluge/tab_meta.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/tab_meta.html
rename to deluge/ui/webui2/templates/deluge/tab_meta.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/tab_options.html b/deluge/ui/webui2/templates/deluge/tab_options.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/tab_options.html
rename to deluge/ui/webui2/templates/deluge/tab_options.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/torrent_add.html b/deluge/ui/webui2/templates/deluge/torrent_add.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/torrent_add.html
rename to deluge/ui/webui2/templates/deluge/torrent_add.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/torrent_delete.html b/deluge/ui/webui2/templates/deluge/torrent_delete.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/torrent_delete.html
rename to deluge/ui/webui2/templates/deluge/torrent_delete.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/torrent_info.html b/deluge/ui/webui2/templates/deluge/torrent_info.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/torrent_info.html
rename to deluge/ui/webui2/templates/deluge/torrent_info.html
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/torrent_move.html b/deluge/ui/webui2/templates/deluge/torrent_move.html
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/deluge/torrent_move.html
rename to deluge/ui/webui2/templates/deluge/torrent_move.html
diff --git a/deluge/ui/webui/webui_plugin/templates/hacking-templates.txt b/deluge/ui/webui2/templates/hacking-templates.txt
similarity index 100%
rename from deluge/ui/webui/webui_plugin/templates/hacking-templates.txt
rename to deluge/ui/webui2/templates/hacking-templates.txt
diff --git a/deluge/ui/webui/webui_plugin/tests/multicall_notepad.py b/deluge/ui/webui2/tests/multicall_notepad.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/tests/multicall_notepad.py
rename to deluge/ui/webui2/tests/multicall_notepad.py
diff --git a/deluge/ui/webui/webui_plugin/tests/test_all.py b/deluge/ui/webui2/tests/test_all.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/tests/test_all.py
rename to deluge/ui/webui2/tests/test_all.py
diff --git a/deluge/ui/webui/webui_plugin/torrent_add.py b/deluge/ui/webui2/torrent_add.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/torrent_add.py
rename to deluge/ui/webui2/torrent_add.py
diff --git a/deluge/ui/webui/webui_plugin/torrent_move.py b/deluge/ui/webui2/torrent_move.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/torrent_move.py
rename to deluge/ui/webui2/torrent_move.py
diff --git a/deluge/ui/webui/webui_plugin/torrent_options.py b/deluge/ui/webui2/torrent_options.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/torrent_options.py
rename to deluge/ui/webui2/torrent_options.py
diff --git a/deluge/ui/webui/webui_plugin/utils.py b/deluge/ui/webui2/utils.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/utils.py
rename to deluge/ui/webui2/utils.py
diff --git a/deluge/ui/webui/webui_plugin/version b/deluge/ui/webui2/version
similarity index 100%
rename from deluge/ui/webui/webui_plugin/version
rename to deluge/ui/webui2/version
diff --git a/deluge/ui/webui/webui_plugin/webserver_common.py b/deluge/ui/webui2/webserver_common.py
similarity index 100%
rename from deluge/ui/webui/webui_plugin/webserver_common.py
rename to deluge/ui/webui2/webserver_common.py