diff --git a/extensions/xdm-browser-monitor/.project b/app/extensions/xdm-browser-monitor/.project
similarity index 100%
rename from extensions/xdm-browser-monitor/.project
rename to app/extensions/xdm-browser-monitor/.project
diff --git a/extensions/xdm-browser-monitor/chrome/background.html b/app/extensions/xdm-browser-monitor/chrome/background.html
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/background.html
rename to app/extensions/xdm-browser-monitor/chrome/background.html
diff --git a/extensions/xdm-browser-monitor/chrome/bg.js b/app/extensions/xdm-browser-monitor/chrome/bg.js
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/bg.js
rename to app/extensions/xdm-browser-monitor/chrome/bg.js
diff --git a/extensions/xdm-browser-monitor/chrome/chrome.zip b/app/extensions/xdm-browser-monitor/chrome/chrome.zip
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/chrome.zip
rename to app/extensions/xdm-browser-monitor/chrome/chrome.zip
diff --git a/extensions/xdm-browser-monitor/chrome/contentscript.js b/app/extensions/xdm-browser-monitor/chrome/contentscript.js
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/contentscript.js
rename to app/extensions/xdm-browser-monitor/chrome/contentscript.js
diff --git a/extensions/xdm-browser-monitor/chrome/disabled.html b/app/extensions/xdm-browser-monitor/chrome/disabled.html
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/disabled.html
rename to app/extensions/xdm-browser-monitor/chrome/disabled.html
diff --git a/extensions/xdm-browser-monitor/chrome/fatal.html b/app/extensions/xdm-browser-monitor/chrome/fatal.html
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/fatal.html
rename to app/extensions/xdm-browser-monitor/chrome/fatal.html
diff --git a/extensions/xdm-browser-monitor/chrome/icon-128.png b/app/extensions/xdm-browser-monitor/chrome/icon-128.png
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/icon-128.png
rename to app/extensions/xdm-browser-monitor/chrome/icon-128.png
diff --git a/extensions/xdm-browser-monitor/chrome/icon.png b/app/extensions/xdm-browser-monitor/chrome/icon.png
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/icon.png
rename to app/extensions/xdm-browser-monitor/chrome/icon.png
diff --git a/extensions/xdm-browser-monitor/chrome/icon_blocked.png b/app/extensions/xdm-browser-monitor/chrome/icon_blocked.png
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/icon_blocked.png
rename to app/extensions/xdm-browser-monitor/chrome/icon_blocked.png
diff --git a/extensions/xdm-browser-monitor/chrome/icon_disabled.png b/app/extensions/xdm-browser-monitor/chrome/icon_disabled.png
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/icon_disabled.png
rename to app/extensions/xdm-browser-monitor/chrome/icon_disabled.png
diff --git a/extensions/xdm-browser-monitor/chrome/manifest - Copy.json b/app/extensions/xdm-browser-monitor/chrome/manifest - Copy.json
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/manifest - Copy.json
rename to app/extensions/xdm-browser-monitor/chrome/manifest - Copy.json
diff --git a/extensions/xdm-browser-monitor/chrome/manifest.json b/app/extensions/xdm-browser-monitor/chrome/manifest.json
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/manifest.json
rename to app/extensions/xdm-browser-monitor/chrome/manifest.json
diff --git a/extensions/xdm-browser-monitor/chrome/popup.js b/app/extensions/xdm-browser-monitor/chrome/popup.js
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/popup.js
rename to app/extensions/xdm-browser-monitor/chrome/popup.js
diff --git a/extensions/xdm-browser-monitor/chrome/status.html b/app/extensions/xdm-browser-monitor/chrome/status.html
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/status.html
rename to app/extensions/xdm-browser-monitor/chrome/status.html
diff --git a/extensions/xdm-browser-monitor/chrome/styles.css b/app/extensions/xdm-browser-monitor/chrome/styles.css
similarity index 100%
rename from extensions/xdm-browser-monitor/chrome/styles.css
rename to app/extensions/xdm-browser-monitor/chrome/styles.css
diff --git a/extensions/xdm-browser-monitor/firefox/background.html b/app/extensions/xdm-browser-monitor/firefox/background.html
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/background.html
rename to app/extensions/xdm-browser-monitor/firefox/background.html
diff --git a/extensions/xdm-browser-monitor/firefox/bg.js b/app/extensions/xdm-browser-monitor/firefox/bg.js
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/bg.js
rename to app/extensions/xdm-browser-monitor/firefox/bg.js
diff --git a/extensions/xdm-browser-monitor/firefox/contentscript.js b/app/extensions/xdm-browser-monitor/firefox/contentscript.js
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/contentscript.js
rename to app/extensions/xdm-browser-monitor/firefox/contentscript.js
diff --git a/extensions/xdm-browser-monitor/firefox/disabled.html b/app/extensions/xdm-browser-monitor/firefox/disabled.html
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/disabled.html
rename to app/extensions/xdm-browser-monitor/firefox/disabled.html
diff --git a/extensions/xdm-browser-monitor/firefox/fatal.html b/app/extensions/xdm-browser-monitor/firefox/fatal.html
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/fatal.html
rename to app/extensions/xdm-browser-monitor/firefox/fatal.html
diff --git a/extensions/xdm-browser-monitor/firefox/firefox.zip b/app/extensions/xdm-browser-monitor/firefox/firefox.zip
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/firefox.zip
rename to app/extensions/xdm-browser-monitor/firefox/firefox.zip
diff --git a/extensions/xdm-browser-monitor/firefox/icon-128.png b/app/extensions/xdm-browser-monitor/firefox/icon-128.png
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/icon-128.png
rename to app/extensions/xdm-browser-monitor/firefox/icon-128.png
diff --git a/extensions/xdm-browser-monitor/firefox/icon.png b/app/extensions/xdm-browser-monitor/firefox/icon.png
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/icon.png
rename to app/extensions/xdm-browser-monitor/firefox/icon.png
diff --git a/extensions/xdm-browser-monitor/firefox/icon_blocked.png b/app/extensions/xdm-browser-monitor/firefox/icon_blocked.png
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/icon_blocked.png
rename to app/extensions/xdm-browser-monitor/firefox/icon_blocked.png
diff --git a/extensions/xdm-browser-monitor/firefox/icon_disabled.png b/app/extensions/xdm-browser-monitor/firefox/icon_disabled.png
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/icon_disabled.png
rename to app/extensions/xdm-browser-monitor/firefox/icon_disabled.png
diff --git a/extensions/xdm-browser-monitor/firefox/manifest.json b/app/extensions/xdm-browser-monitor/firefox/manifest.json
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/manifest.json
rename to app/extensions/xdm-browser-monitor/firefox/manifest.json
diff --git a/extensions/xdm-browser-monitor/firefox/popup.js b/app/extensions/xdm-browser-monitor/firefox/popup.js
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/popup.js
rename to app/extensions/xdm-browser-monitor/firefox/popup.js
diff --git a/extensions/xdm-browser-monitor/firefox/status.html b/app/extensions/xdm-browser-monitor/firefox/status.html
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/status.html
rename to app/extensions/xdm-browser-monitor/firefox/status.html
diff --git a/extensions/xdm-browser-monitor/firefox/styles.css b/app/extensions/xdm-browser-monitor/firefox/styles.css
similarity index 100%
rename from extensions/xdm-browser-monitor/firefox/styles.css
rename to app/extensions/xdm-browser-monitor/firefox/styles.css
diff --git a/extensions/xdm-browser-monitor/icon_main.png b/app/extensions/xdm-browser-monitor/icon_main.png
similarity index 100%
rename from extensions/xdm-browser-monitor/icon_main.png
rename to app/extensions/xdm-browser-monitor/icon_main.png
diff --git a/translations/ar.txt b/app/translations/ar.txt
similarity index 100%
rename from translations/ar.txt
rename to app/translations/ar.txt
diff --git a/translations/cs-CZ.txt b/app/translations/cs-CZ.txt
similarity index 100%
rename from translations/cs-CZ.txt
rename to app/translations/cs-CZ.txt
diff --git a/translations/de.txt b/app/translations/de.txt
similarity index 100%
rename from translations/de.txt
rename to app/translations/de.txt
diff --git a/translations/en.txt b/app/translations/en.txt
similarity index 100%
rename from translations/en.txt
rename to app/translations/en.txt
diff --git a/translations/es.txt b/app/translations/es.txt
similarity index 100%
rename from translations/es.txt
rename to app/translations/es.txt
diff --git a/translations/fa.txt b/app/translations/fa.txt
similarity index 100%
rename from translations/fa.txt
rename to app/translations/fa.txt
diff --git a/translations/fr.txt b/app/translations/fr.txt
similarity index 100%
rename from translations/fr.txt
rename to app/translations/fr.txt
diff --git a/translations/hu.txt b/app/translations/hu.txt
similarity index 100%
rename from translations/hu.txt
rename to app/translations/hu.txt
diff --git a/translations/id.txt b/app/translations/id.txt
similarity index 100%
rename from translations/id.txt
rename to app/translations/id.txt
diff --git a/translations/it.txt b/app/translations/it.txt
similarity index 100%
rename from translations/it.txt
rename to app/translations/it.txt
diff --git a/translations/ko.txt b/app/translations/ko.txt
similarity index 100%
rename from translations/ko.txt
rename to app/translations/ko.txt
diff --git a/translations/map b/app/translations/map
similarity index 100%
rename from translations/map
rename to app/translations/map
diff --git a/translations/ml.txt b/app/translations/ml.txt
similarity index 100%
rename from translations/ml.txt
rename to app/translations/ml.txt
diff --git a/translations/np.txt b/app/translations/np.txt
similarity index 100%
rename from translations/np.txt
rename to app/translations/np.txt
diff --git a/translations/pl.txt b/app/translations/pl.txt
similarity index 100%
rename from translations/pl.txt
rename to app/translations/pl.txt
diff --git a/translations/pt-br.txt b/app/translations/pt-br.txt
similarity index 100%
rename from translations/pt-br.txt
rename to app/translations/pt-br.txt
diff --git a/translations/ro.txt b/app/translations/ro.txt
similarity index 100%
rename from translations/ro.txt
rename to app/translations/ro.txt
diff --git a/translations/ru.txt b/app/translations/ru.txt
similarity index 100%
rename from translations/ru.txt
rename to app/translations/ru.txt
diff --git a/translations/sr_cyr.txt b/app/translations/sr_cyr.txt
similarity index 100%
rename from translations/sr_cyr.txt
rename to app/translations/sr_cyr.txt
diff --git a/translations/sr_lat.txt b/app/translations/sr_lat.txt
similarity index 100%
rename from translations/sr_lat.txt
rename to app/translations/sr_lat.txt
diff --git a/translations/tr.txt b/app/translations/tr.txt
similarity index 100%
rename from translations/tr.txt
rename to app/translations/tr.txt
diff --git a/translations/tw.txt b/app/translations/tw.txt
similarity index 100%
rename from translations/tw.txt
rename to app/translations/tw.txt
diff --git a/translations/vi.txt b/app/translations/vi.txt
similarity index 100%
rename from translations/vi.txt
rename to app/translations/vi.txt
diff --git a/translations/zh-cn.txt b/app/translations/zh-cn.txt
similarity index 100%
rename from translations/zh-cn.txt
rename to app/translations/zh-cn.txt
diff --git a/translations/zh-tw.txt b/app/translations/zh-tw.txt
similarity index 100%
rename from translations/zh-tw.txt
rename to app/translations/zh-tw.txt