diff --git a/pythonrewrite/bin2/CryptoBox.py b/pythonrewrite/bin/CryptoBox.py
similarity index 100%
rename from pythonrewrite/bin2/CryptoBox.py
rename to pythonrewrite/bin/CryptoBox.py
diff --git a/pythonrewrite/bin2/CryptoBoxContainer.py b/pythonrewrite/bin/CryptoBoxContainer.py
similarity index 100%
rename from pythonrewrite/bin2/CryptoBoxContainer.py
rename to pythonrewrite/bin/CryptoBoxContainer.py
diff --git a/pythonrewrite/bin2/CryptoBoxExceptions.py b/pythonrewrite/bin/CryptoBoxExceptions.py
similarity index 100%
rename from pythonrewrite/bin2/CryptoBoxExceptions.py
rename to pythonrewrite/bin/CryptoBoxExceptions.py
diff --git a/pythonrewrite/bin2/CryptoBoxRootActions.py b/pythonrewrite/bin/CryptoBoxRootActions.py
similarity index 100%
rename from pythonrewrite/bin2/CryptoBoxRootActions.py
rename to pythonrewrite/bin/CryptoBoxRootActions.py
diff --git a/pythonrewrite/bin2/CryptoBoxSettings.py b/pythonrewrite/bin/CryptoBoxSettings.py
similarity index 100%
rename from pythonrewrite/bin2/CryptoBoxSettings.py
rename to pythonrewrite/bin/CryptoBoxSettings.py
diff --git a/pythonrewrite/bin2/CryptoBoxWebserver.py b/pythonrewrite/bin/CryptoBoxWebserver.py
similarity index 100%
rename from pythonrewrite/bin2/CryptoBoxWebserver.py
rename to pythonrewrite/bin/CryptoBoxWebserver.py
diff --git a/pythonrewrite/bin2/Plugins.py b/pythonrewrite/bin/Plugins.py
similarity index 100%
rename from pythonrewrite/bin2/Plugins.py
rename to pythonrewrite/bin/Plugins.py
diff --git a/pythonrewrite/bin2/WebInterfaceDataset.py b/pythonrewrite/bin/WebInterfaceDataset.py
similarity index 100%
rename from pythonrewrite/bin2/WebInterfaceDataset.py
rename to pythonrewrite/bin/WebInterfaceDataset.py
diff --git a/pythonrewrite/bin2/WebInterfaceSites.py b/pythonrewrite/bin/WebInterfaceSites.py
similarity index 100%
rename from pythonrewrite/bin2/WebInterfaceSites.py
rename to pythonrewrite/bin/WebInterfaceSites.py
diff --git a/pythonrewrite/bin2/coding_guidelines.txt b/pythonrewrite/bin/coding_guidelines.txt
similarity index 100%
rename from pythonrewrite/bin2/coding_guidelines.txt
rename to pythonrewrite/bin/coding_guidelines.txt
diff --git a/pythonrewrite/bin2/cryptobox.conf b/pythonrewrite/bin/cryptobox.conf
similarity index 100%
rename from pythonrewrite/bin2/cryptobox.conf
rename to pythonrewrite/bin/cryptobox.conf
diff --git a/pythonrewrite/bin2/cryptoboxwebserver.conf b/pythonrewrite/bin/cryptoboxwebserver.conf
similarity index 86%
rename from pythonrewrite/bin2/cryptoboxwebserver.conf
rename to pythonrewrite/bin/cryptoboxwebserver.conf
index 6c11617..c170041 100644
--- a/pythonrewrite/bin2/cryptoboxwebserver.conf
+++ b/pythonrewrite/bin/cryptoboxwebserver.conf
@@ -9,6 +9,6 @@ server.logFile = "cryptoboxwebserver.log"
 
 [/favicon.ico]
 static_filter.on = True
-# RFC why the cherry and not the ant?
+# TODO: for now, we do not have a cryptobox favicon
 static_filter.file = "/usr/share/doc/python-cherrypy/cherrypy/favicon.ico"
 
diff --git a/pythonrewrite/bin2/example-super.tab b/pythonrewrite/bin/example-super.tab
similarity index 100%
rename from pythonrewrite/bin2/example-super.tab
rename to pythonrewrite/bin/example-super.tab
diff --git a/pythonrewrite/bin2/test.complete.CryptoBox.py b/pythonrewrite/bin/test.complete.CryptoBox.py
similarity index 100%
rename from pythonrewrite/bin2/test.complete.CryptoBox.py
rename to pythonrewrite/bin/test.complete.CryptoBox.py
diff --git a/pythonrewrite/bin2/unittests.CryptoBox.py b/pythonrewrite/bin/unittests.CryptoBox.py
similarity index 100%
rename from pythonrewrite/bin2/unittests.CryptoBox.py
rename to pythonrewrite/bin/unittests.CryptoBox.py
diff --git a/pythonrewrite/bin2/unittests.CryptoBoxWebserver.py b/pythonrewrite/bin/unittests.CryptoBoxWebserver.py
similarity index 100%
rename from pythonrewrite/bin2/unittests.CryptoBoxWebserver.py
rename to pythonrewrite/bin/unittests.CryptoBoxWebserver.py