diff --git a/meson.build b/meson.build
index 05aa687e4..08187e955 100644
--- a/meson.build
+++ b/meson.build
@@ -399,7 +399,6 @@ subdir('data/fonts')
 subdir('data/icons')
 subdir('data/images')
 subdir('data/input_methods')
-subdir('data/tools')
 subdir('data/units')
 subdir('data/session')
 
diff --git a/src/bin/meson.build b/src/bin/meson.build
index 6f086e116..c530c9333 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -471,29 +471,6 @@ executable('enlightenment_start',
            install            : true
           )
 
-executable('enlightenment_filemanager',
-           [ 'e_fm_cmdline.c' ],
-           include_directories: include_directories('../..'),
-           dependencies       : [ dep_eina, dep_ecore, dep_ecore_file, dep_eldbus, dep_efreet ],
-           install_dir        : dir_bin,
-           install            : true
-          )
-
-executable('enlightenment_open',
-           [ 'e_open.c' ],
-           include_directories: include_directories('../..'),
-           dependencies       : [ dep_eina, dep_ecore, dep_efreet, dep_efreet_mime ],
-           install_dir        : dir_bin,
-           install            : true
-          )
-
-executable('enlightenment_askpass',
-           [ 'e_askpass_main.c' ],
-           dependencies: [ dep_elementary ],
-           install_dir : dir_bin,
-           install     : true
-          )
-
 executable('enlightenment_fm_op',
            [ 'e_fm_op.c' ],
            include_directories: include_directories('../..'),
diff --git a/src/bin/e_askpass_main.c b/src/bin/tools/askpass/e_askpass_main.c
similarity index 100%
rename from src/bin/e_askpass_main.c
rename to src/bin/tools/askpass/e_askpass_main.c
diff --git a/src/bin/tools/askpass/meson.build b/src/bin/tools/askpass/meson.build
new file mode 100644
index 000000000..fe161636d
--- /dev/null
+++ b/src/bin/tools/askpass/meson.build
@@ -0,0 +1,6 @@
+executable('enlightenment_askpass',
+           [ 'e_askpass_main.c' ],
+           dependencies: [ dep_elementary ],
+           install_dir : dir_bin,
+           install     : true
+          )
diff --git a/src/bin/e_fm_cmdline.c b/src/bin/tools/filemanager/e_fm_cmdline.c
similarity index 100%
rename from src/bin/e_fm_cmdline.c
rename to src/bin/tools/filemanager/e_fm_cmdline.c
diff --git a/src/bin/tools/filemanager/meson.build b/src/bin/tools/filemanager/meson.build
new file mode 100644
index 000000000..f9523b98c
--- /dev/null
+++ b/src/bin/tools/filemanager/meson.build
@@ -0,0 +1,7 @@
+executable('enlightenment_filemanager',
+           [ 'e_fm_cmdline.c' ],
+           include_directories: include_directories('../../../..'),
+           dependencies       : [ dep_eina, dep_ecore, dep_ecore_file, dep_eldbus, dep_efreet ],
+           install_dir        : dir_bin,
+           install            : true
+          )
diff --git a/src/bin/tools/meson.build b/src/bin/tools/meson.build
index d694873f2..767cc2274 100644
--- a/src/bin/tools/meson.build
+++ b/src/bin/tools/meson.build
@@ -1 +1,5 @@
 subdir('paledit')
+subdir('filemanager')
+subdir('open')
+subdir('askpass')
+subdir('remote')
diff --git a/src/bin/e_open.c b/src/bin/tools/open/e_open.c
similarity index 100%
rename from src/bin/e_open.c
rename to src/bin/tools/open/e_open.c
diff --git a/src/bin/tools/open/meson.build b/src/bin/tools/open/meson.build
new file mode 100644
index 000000000..a9e1dde2b
--- /dev/null
+++ b/src/bin/tools/open/meson.build
@@ -0,0 +1,7 @@
+executable('enlightenment_open',
+           [ 'e_open.c' ],
+           include_directories: include_directories('../../../..'),
+           dependencies       : [ dep_eina, dep_ecore, dep_efreet, dep_efreet_mime ],
+           install_dir        : dir_bin,
+           install            : true
+          )
diff --git a/src/bin/tools/paledit/enlightenment_paledit.desktop b/src/bin/tools/paledit/enlightenment_paledit.desktop
index abe8ca22a..a48228bb2 100644
--- a/src/bin/tools/paledit/enlightenment_paledit.desktop
+++ b/src/bin/tools/paledit/enlightenment_paledit.desktop
@@ -3,10 +3,10 @@ Type=Application
 Name=Palette Editor
 Name[fr]=Éditeur de palette
 Name[it]=Editor della palette
-Icon=e_paledit
-Exec=e_paledit
+Icon=enlightenment_paledit
+Exec=enlightenment_paledit
 Comment=A tool for editing color schemes and palette for Enlightenment
 Comment[fr]=Outil d'édition des jeux de couleurs et palette pour Enlightenment
 Comment[it]=Strumento per la modifica degli schemi colore e palette per Enlightenment
 Categories=Settings;DesktopSettings;
-StartupWMClass=e_paledit
+StartupWMClass=enlightenment_paledit
diff --git a/data/tools/enlightenment_remote b/src/bin/tools/remote/enlightenment_remote
similarity index 100%
rename from data/tools/enlightenment_remote
rename to src/bin/tools/remote/enlightenment_remote
diff --git a/data/tools/meson.build b/src/bin/tools/remote/meson.build
similarity index 100%
rename from data/tools/meson.build
rename to src/bin/tools/remote/meson.build