diff --git a/tool/mypdns_defender/LICENSE b/tool/mypdns/defender/LICENSE
similarity index 100%
rename from tool/mypdns_defender/LICENSE
rename to tool/mypdns/defender/LICENSE
diff --git a/tool/mypdns_defender/addon/firefox/addon.xpi b/tool/mypdns/defender/addon/firefox/addon.xpi
similarity index 100%
rename from tool/mypdns_defender/addon/firefox/addon.xpi
rename to tool/mypdns/defender/addon/firefox/addon.xpi
diff --git a/tool/mypdns_defender/addon/firefox/icon.png b/tool/mypdns/defender/addon/firefox/icon.png
similarity index 100%
rename from tool/mypdns_defender/addon/firefox/icon.png
rename to tool/mypdns/defender/addon/firefox/icon.png
diff --git a/tool/mypdns_defender/addon/firefox/main.js b/tool/mypdns/defender/addon/firefox/main.js
similarity index 100%
rename from tool/mypdns_defender/addon/firefox/main.js
rename to tool/mypdns/defender/addon/firefox/main.js
diff --git a/tool/mypdns_defender/addon/firefox/manifest.json b/tool/mypdns/defender/addon/firefox/manifest.json
similarity index 100%
rename from tool/mypdns_defender/addon/firefox/manifest.json
rename to tool/mypdns/defender/addon/firefox/manifest.json
diff --git a/tool/mypdns_reporter/LICENSE b/tool/mypdns/reporter/LICENSE
similarity index 100%
rename from tool/mypdns_reporter/LICENSE
rename to tool/mypdns/reporter/LICENSE
diff --git a/tool/mypdns_reporter/addon/chrome/addon.crx b/tool/mypdns/reporter/addon/chrome/addon.crx
similarity index 100%
rename from tool/mypdns_reporter/addon/chrome/addon.crx
rename to tool/mypdns/reporter/addon/chrome/addon.crx
diff --git a/tool/mypdns_reporter/addon/chrome/conf.html b/tool/mypdns/reporter/addon/chrome/conf.html
similarity index 100%
rename from tool/mypdns_reporter/addon/chrome/conf.html
rename to tool/mypdns/reporter/addon/chrome/conf.html
diff --git a/tool/mypdns_reporter/addon/chrome/conf.js b/tool/mypdns/reporter/addon/chrome/conf.js
similarity index 100%
rename from tool/mypdns_reporter/addon/chrome/conf.js
rename to tool/mypdns/reporter/addon/chrome/conf.js
diff --git a/tool/mypdns_reporter/addon/chrome/icon.png b/tool/mypdns/reporter/addon/chrome/icon.png
similarity index 100%
rename from tool/mypdns_reporter/addon/chrome/icon.png
rename to tool/mypdns/reporter/addon/chrome/icon.png
diff --git a/tool/mypdns_reporter/addon/chrome/main.js b/tool/mypdns/reporter/addon/chrome/main.js
similarity index 100%
rename from tool/mypdns_reporter/addon/chrome/main.js
rename to tool/mypdns/reporter/addon/chrome/main.js
diff --git a/tool/mypdns_reporter/addon/chrome/manifest.json b/tool/mypdns/reporter/addon/chrome/manifest.json
similarity index 100%
rename from tool/mypdns_reporter/addon/chrome/manifest.json
rename to tool/mypdns/reporter/addon/chrome/manifest.json
diff --git a/tool/mypdns_reporter/addon/firefox/addon.xpi b/tool/mypdns/reporter/addon/firefox/addon.xpi
similarity index 100%
rename from tool/mypdns_reporter/addon/firefox/addon.xpi
rename to tool/mypdns/reporter/addon/firefox/addon.xpi
diff --git a/tool/mypdns_reporter/addon/firefox/conf.html b/tool/mypdns/reporter/addon/firefox/conf.html
similarity index 100%
rename from tool/mypdns_reporter/addon/firefox/conf.html
rename to tool/mypdns/reporter/addon/firefox/conf.html
diff --git a/tool/mypdns_reporter/addon/firefox/conf.js b/tool/mypdns/reporter/addon/firefox/conf.js
similarity index 100%
rename from tool/mypdns_reporter/addon/firefox/conf.js
rename to tool/mypdns/reporter/addon/firefox/conf.js
diff --git a/tool/mypdns_reporter/addon/firefox/icon.png b/tool/mypdns/reporter/addon/firefox/icon.png
similarity index 100%
rename from tool/mypdns_reporter/addon/firefox/icon.png
rename to tool/mypdns/reporter/addon/firefox/icon.png
diff --git a/tool/mypdns_reporter/addon/firefox/main.js b/tool/mypdns/reporter/addon/firefox/main.js
similarity index 100%
rename from tool/mypdns_reporter/addon/firefox/main.js
rename to tool/mypdns/reporter/addon/firefox/main.js
diff --git a/tool/mypdns_reporter/addon/firefox/manifest.json b/tool/mypdns/reporter/addon/firefox/manifest.json
similarity index 100%
rename from tool/mypdns_reporter/addon/firefox/manifest.json
rename to tool/mypdns/reporter/addon/firefox/manifest.json
diff --git a/tool/mypdns_reporter/cli/mypdnsrep.app b/tool/mypdns/reporter/cli/mypdnsrep.app
similarity index 100%
rename from tool/mypdns_reporter/cli/mypdnsrep.app
rename to tool/mypdns/reporter/cli/mypdnsrep.app
diff --git a/tool/mypdns_reporter/cli/mypdnsrep.exe b/tool/mypdns/reporter/cli/mypdnsrep.exe
similarity index 100%
rename from tool/mypdns_reporter/cli/mypdnsrep.exe
rename to tool/mypdns/reporter/cli/mypdnsrep.exe
diff --git a/tool/mypdns_reporter/cli/mypdnsrep.linux b/tool/mypdns/reporter/cli/mypdnsrep.linux
similarity index 100%
rename from tool/mypdns_reporter/cli/mypdnsrep.linux
rename to tool/mypdns/reporter/cli/mypdnsrep.linux
diff --git a/tool/mypdns_reporter/cli/source.js b/tool/mypdns/reporter/cli/source.js
similarity index 100%
rename from tool/mypdns_reporter/cli/source.js
rename to tool/mypdns/reporter/cli/source.js
diff --git a/tool/mypdns_reporter/gui/gui.zip b/tool/mypdns/reporter/gui/gui.zip
similarity index 100%
rename from tool/mypdns_reporter/gui/gui.zip
rename to tool/mypdns/reporter/gui/gui.zip
diff --git a/tool/mypdns_reporter/gui/source.sp b/tool/mypdns/reporter/gui/source.sp
similarity index 100%
rename from tool/mypdns_reporter/gui/source.sp
rename to tool/mypdns/reporter/gui/source.sp
diff --git a/tool/mypdns/update_firefox.json b/tool/mypdns/update_firefox.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/tool/mypdns/update_firefox.json
@@ -0,0 +1 @@
+{}