diff --git a/src/messenger/build.xml b/src/messenger/build.xml
index b5cf0da5..71bf3774 100644
--- a/src/messenger/build.xml
+++ b/src/messenger/build.xml
@@ -42,7 +42,7 @@
         </apply>
 
         <!-- Flatten templates directory structure -->
-        <apply executable="build_scripts/flat_cp" force="true">
+        <apply executable="tools/flat_cp" force="true">
             <srcfile />
             <targetfile />
             <arg value="handlebars_templates" />
@@ -150,7 +150,7 @@
         <!-- Concatenate all scripts in one file. Use special script for
              expanding wildcards. -->
         <echo>Concatenate JavaScript files</echo>
-        <apply executable="build_scripts/cat">
+        <apply executable="tools/cat">
             <srcfile suffix="/*.js"/>
             <targetfile />
             <dirset dir=".">
diff --git a/src/messenger/build_scripts/cat b/src/messenger/tools/cat
old mode 100755
new mode 100644
similarity index 100%
rename from src/messenger/build_scripts/cat
rename to src/messenger/tools/cat
diff --git a/src/messenger/build_scripts/flat_cp b/src/messenger/tools/flat_cp
old mode 100755
new mode 100644
similarity index 100%
rename from src/messenger/build_scripts/flat_cp
rename to src/messenger/tools/flat_cp