59 files changed, 10 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 31d862b4..0fa20c72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,9 +35,9 @@ venv/
 ENV/
 
 # Javascript, web-ui
-www/node_modules
-www/npm-debug.log
-www/pydist/bitmask_js
+ui/node_modules
+ui/npm-debug.log
+ui/pydist/bitmask_js
 
 # vim
 *.swp
diff --git a/Makefile b/Makefile
index 46a6ca80..49472bb5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ clean:
 
 dev-mail:
 	pip install -e '.[mail]'
-	make -C www dev-install-prebuilt
+	make -C ui dev-install-prebuilt
 
 dev-all:
 	pip install -e '.[all]'
diff --git a/README.rst b/README.rst
index 6f2f98d6..d8f6a3b9 100644
--- a/README.rst
+++ b/README.rst
@@ -111,11 +111,11 @@ First, install the javascript prerequisites:
 Next, run ``dev-install``:
 
   source venv/bin/activate    # if not already activated
-  cd www
+  cd ui
   make dev-install            # install JS user interface as a python package in "develop" mode.
   node run watch              # continually rebuild javascript bundle when source files change.
 
-For more information, see ``www/README.md``.
+For more information, see ``ui/README.md``.
 
 cross-testing
 +++++++++++++++++++++++++++++++++++++++
diff --git a/src/leap/bitmask/core/web/README b/src/leap/bitmask/core/web/README
index 76a745df..5826c527 100644
--- a/src/leap/bitmask/core/web/README
+++ b/src/leap/bitmask/core/web/README
@@ -1,9 +1,9 @@
 This is the original implementation of the bitmask.js library, which uses the
 REST api exposed by the HTTPRequestDispatcher.
 
-The development of bitmask_js is in the www/ folder in this bitmask-dev repo.
+The development of bitmask_js is in the ui/ folder in this bitmask-dev repo.
 
-A pre-compiled version of the html+js web-ui can be found in the leap.bitmask_www package.
+A pre-compiled version of the html+js web-ui can be found in the bitmask_js package.
 
 This remains here to be able to develop against the REST api without the need
-of installing the full-fledged bitmask_www package.
+of installing the full-fledged bitmask_js package.
diff --git a/src/leap/bitmask/gui/README.rst b/src/leap/bitmask/gui/README.rst
index 431bcfc8..c3a6a0f2 100644
--- a/src/leap/bitmask/gui/README.rst
+++ b/src/leap/bitmask/gui/README.rst
@@ -1,5 +1,5 @@
 bitmask.gui is a module that depends on PyQt.
 It is declared as an extra in bitmask setup.py
 
-Its function is to launch a minimalistic browser that serves the bitmask_www
+Its function is to launch a minimalistic browser that serves the bitmask_js
 interface.
diff --git a/www/Makefile b/ui/Makefile
index d67a02b3..d67a02b3 100644
--- a/www/Makefile
+++ b/ui/Makefile
diff --git a/www/README.md b/ui/README.md
index 3f276c00..3f276c00 100644
--- a/www/README.md
+++ b/ui/README.md
diff --git a/www/app/app.js b/ui/app/app.js
index 57120a4e..57120a4e 100644
--- a/www/app/app.js
+++ b/ui/app/app.js
diff --git a/www/app/components/area.js b/ui/app/components/area.js
index e903e5f5..e903e5f5 100644
--- a/www/app/components/area.js
+++ b/ui/app/components/area.js
diff --git a/www/app/components/center.js b/ui/app/components/center.js
index 6fa62128..6fa62128 100644
--- a/www/app/components/center.js
+++ b/ui/app/components/center.js
diff --git a/www/app/components/debug_panel.js b/ui/app/components/debug_panel.js
index 7515ba84..7515ba84 100644
--- a/www/app/components/debug_panel.js
+++ b/ui/app/components/debug_panel.js
diff --git a/www/app/components/error_panel.js b/ui/app/components/error_panel.js
index fc88d459..fc88d459 100644
--- a/www/app/components/error_panel.js
+++ b/ui/app/components/error_panel.js
diff --git a/www/app/components/greeter_panel.js b/ui/app/components/greeter_panel.js
index 4552db18..4552db18 100644
--- a/www/app/components/greeter_panel.js
+++ b/ui/app/components/greeter_panel.js
diff --git a/www/app/components/list_edit.js b/ui/app/components/list_edit.js
index 0d557d22..0d557d22 100644
--- a/www/app/components/list_edit.js
+++ b/ui/app/components/list_edit.js
diff --git a/www/app/components/login.js b/ui/app/components/login.js
index fe4ef5b2..fe4ef5b2 100644
--- a/www/app/components/login.js
+++ b/ui/app/components/login.js
diff --git a/www/app/components/main_panel/account_list.js b/ui/app/components/main_panel/account_list.js
index d0ef092f..d0ef092f 100644
--- a/www/app/components/main_panel/account_list.js
+++ b/ui/app/components/main_panel/account_list.js
diff --git a/www/app/components/main_panel/email_section.js b/ui/app/components/main_panel/email_section.js
index a6525d92..a6525d92 100644
--- a/www/app/components/main_panel/email_section.js
+++ b/ui/app/components/main_panel/email_section.js
diff --git a/www/app/components/main_panel/index.js b/ui/app/components/main_panel/index.js
index 3cc6c11f..3cc6c11f 100644
--- a/www/app/components/main_panel/index.js
+++ b/ui/app/components/main_panel/index.js
diff --git a/www/app/components/main_panel/main_panel.less b/ui/app/components/main_panel/main_panel.less
index 4e0ecb05..4e0ecb05 100644
--- a/www/app/components/main_panel/main_panel.less
+++ b/ui/app/components/main_panel/main_panel.less
diff --git a/www/app/components/main_panel/section_layout.js b/ui/app/components/main_panel/section_layout.js
index e7c6f2ab..e7c6f2ab 100644
--- a/www/app/components/main_panel/section_layout.js
+++ b/ui/app/components/main_panel/section_layout.js
diff --git a/www/app/components/main_panel/user_section.js b/ui/app/components/main_panel/user_section.js
index 0b4ba136..0b4ba136 100644
--- a/www/app/components/main_panel/user_section.js
+++ b/ui/app/components/main_panel/user_section.js
diff --git a/www/app/components/main_panel/vpn_section.js b/ui/app/components/main_panel/vpn_section.js
index e69de29b..e69de29b 100644
--- a/www/app/components/main_panel/vpn_section.js
+++ b/ui/app/components/main_panel/vpn_section.js
diff --git a/www/app/components/panel_switcher.js b/ui/app/components/panel_switcher.js
index aaf2dc5b..aaf2dc5b 100644
--- a/www/app/components/panel_switcher.js
+++ b/ui/app/components/panel_switcher.js
diff --git a/www/app/components/spinner/index.js b/ui/app/components/spinner/index.js
index ffc32850..ffc32850 100644
--- a/www/app/components/spinner/index.js
+++ b/ui/app/components/spinner/index.js
diff --git a/www/app/components/spinner/spinner.css b/ui/app/components/spinner/spinner.css
index 5e8535c9..5e8535c9 100644
--- a/www/app/components/spinner/spinner.css
+++ b/ui/app/components/spinner/spinner.css
diff --git a/www/app/components/splash.js b/ui/app/components/splash.js
index 46170d23..46170d23 100644
--- a/www/app/components/splash.js
+++ b/ui/app/components/splash.js
diff --git a/www/app/components/wizard/add_provider_modal.js b/ui/app/components/wizard/add_provider_modal.js
index bc5e0236..bc5e0236 100644
--- a/www/app/components/wizard/add_provider_modal.js
+++ b/ui/app/components/wizard/add_provider_modal.js
diff --git a/www/app/components/wizard/index.js b/ui/app/components/wizard/index.js
index 613b88fd..613b88fd 100644
--- a/www/app/components/wizard/index.js
+++ b/ui/app/components/wizard/index.js
diff --git a/www/app/components/wizard/provider_select_stage.js b/ui/app/components/wizard/provider_select_stage.js
index 20674be1..20674be1 100644
--- a/www/app/components/wizard/provider_select_stage.js
+++ b/ui/app/components/wizard/provider_select_stage.js
diff --git a/www/app/components/wizard/stage_layout.js b/ui/app/components/wizard/stage_layout.js
index 31540221..31540221 100644
--- a/www/app/components/wizard/stage_layout.js
+++ b/ui/app/components/wizard/stage_layout.js
diff --git a/www/app/components/wizard/wizard.less b/ui/app/components/wizard/wizard.less
index 29efc20e..29efc20e 100644
--- a/www/app/components/wizard/wizard.less
+++ b/ui/app/components/wizard/wizard.less
diff --git a/www/app/css/bootstrap.less b/ui/app/css/bootstrap.less
index 3b772284..3b772284 100644
--- a/www/app/css/bootstrap.less
+++ b/ui/app/css/bootstrap.less
diff --git a/www/app/css/common.css b/ui/app/css/common.css
index acf164ee..acf164ee 100644
--- a/www/app/css/common.css
+++ b/ui/app/css/common.css
diff --git a/www/app/img/arrow-down.svg b/ui/app/img/arrow-down.svg
index 14c4b5d1..14c4b5d1 100644
--- a/www/app/img/arrow-down.svg
+++ b/ui/app/img/arrow-down.svg
diff --git a/www/app/img/arrow-up.svg b/ui/app/img/arrow-up.svg
index 30ea8fde..30ea8fde 100644
--- a/www/app/img/arrow-up.svg
+++ b/ui/app/img/arrow-up.svg
diff --git a/www/app/img/cloud.svg b/ui/app/img/cloud.svg
index bf7a94af..bf7a94af 100644
--- a/www/app/img/cloud.svg
+++ b/ui/app/img/cloud.svg
diff --git a/www/app/img/disabled.svg b/ui/app/img/disabled.svg
index 90804d83..90804d83 100644
--- a/www/app/img/disabled.svg
+++ b/ui/app/img/disabled.svg
diff --git a/www/app/img/envelope.svg b/ui/app/img/envelope.svg
index 5775e097..5775e097 100644
--- a/www/app/img/envelope.svg
+++ b/ui/app/img/envelope.svg
diff --git a/www/app/img/gear.svg b/ui/app/img/gear.svg
index be5a5b33..be5a5b33 100644
--- a/www/app/img/gear.svg
+++ b/ui/app/img/gear.svg
diff --git a/www/app/img/mask.svg b/ui/app/img/mask.svg
index f254c5e0..f254c5e0 100644
--- a/www/app/img/mask.svg
+++ b/ui/app/img/mask.svg
diff --git a/www/app/img/off.svg b/ui/app/img/off.svg
index 35c49a56..35c49a56 100644
--- a/www/app/img/off.svg
+++ b/ui/app/img/off.svg
diff --git a/www/app/img/on.svg b/ui/app/img/on.svg
index 36938e0a..36938e0a 100644
--- a/www/app/img/on.svg
+++ b/ui/app/img/on.svg
diff --git a/www/app/img/planet.svg b/ui/app/img/planet.svg
index 5697d5d6..5697d5d6 100644
--- a/www/app/img/planet.svg
+++ b/ui/app/img/planet.svg
diff --git a/www/app/img/unknown.svg b/ui/app/img/unknown.svg
index 60038638..60038638 100644
--- a/www/app/img/unknown.svg
+++ b/ui/app/img/unknown.svg
diff --git a/www/app/img/user.svg b/ui/app/img/user.svg
index ad86a757..ad86a757 100644
--- a/www/app/img/user.svg
+++ b/ui/app/img/user.svg
diff --git a/www/app/img/wait.svg b/ui/app/img/wait.svg
index 2ae0113a..2ae0113a 100644
--- a/www/app/img/wait.svg
+++ b/ui/app/img/wait.svg
diff --git a/www/app/index.html b/ui/app/index.html
index 440e0b6f..440e0b6f 100644
--- a/www/app/index.html
+++ b/ui/app/index.html
diff --git a/www/app/lib/bitmask.js b/ui/app/lib/bitmask.js
index fedd5fcd..fedd5fcd 100644
--- a/www/app/lib/bitmask.js
+++ b/ui/app/lib/bitmask.js
diff --git a/www/app/lib/color.js b/ui/app/lib/color.js
index 5b1dfee9..5b1dfee9 100644
--- a/www/app/lib/color.js
+++ b/ui/app/lib/color.js
diff --git a/www/app/lib/colors.js b/ui/app/lib/colors.js
index d86ca0a8..d86ca0a8 100644
--- a/www/app/lib/colors.js
+++ b/ui/app/lib/colors.js
diff --git a/www/app/lib/common.js b/ui/app/lib/common.js
index 14a30c32..14a30c32 100644
--- a/www/app/lib/common.js
+++ b/ui/app/lib/common.js
diff --git a/www/app/lib/validate.js b/ui/app/lib/validate.js
index 4e672e8f..4e672e8f 100644
--- a/www/app/lib/validate.js
+++ b/ui/app/lib/validate.js
diff --git a/www/app/main.js b/ui/app/main.js
index b1628953..b1628953 100644
--- a/www/app/main.js
+++ b/ui/app/main.js
diff --git a/www/app/models/account.js b/ui/app/models/account.js
index 52fea93d..52fea93d 100644
--- a/www/app/models/account.js
+++ b/ui/app/models/account.js
diff --git a/www/app/models/dummy_account.js b/ui/app/models/dummy_account.js
index 99fb6623..99fb6623 100644
--- a/www/app/models/dummy_account.js
+++ b/ui/app/models/dummy_account.js
diff --git a/www/package.json b/ui/package.json
index d491edd8..d491edd8 100644
--- a/www/package.json
+++ b/ui/package.json
diff --git a/www/pydist/README.md b/ui/pydist/README.md
index 6e2b11f6..6e2b11f6 100644
--- a/www/pydist/README.md
+++ b/ui/pydist/README.md
diff --git a/www/pydist/setup.py b/ui/pydist/setup.py
index b5d3ffb1..b5d3ffb1 100644
--- a/www/pydist/setup.py
+++ b/ui/pydist/setup.py
diff --git a/www/webpack.config.js b/ui/webpack.config.js
index c0f8d191..c0f8d191 100644
--- a/www/webpack.config.js
+++ b/ui/webpack.config.js