diff --git a/src/indexer/meson.build b/src/indexer/meson.build
new file mode 100644
index 0000000..6bcc38e
--- /dev/null
+++ b/src/indexer/meson.build
@@ -0,0 +1,3 @@
+executable('kiwix-index', ['kiwix-index.cpp'],
+  dependencies:all_deps,
+  install:true)
diff --git a/src/installer/kiwix-install.cpp b/src/installer/kiwix-install.cpp
index 06f5a1e..ead1df7 100644
--- a/src/installer/kiwix-install.cpp
+++ b/src/installer/kiwix-install.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <getopt.h>
-#include <pathTools.h>
+#include <kiwix/common/pathTools.h>
 #include <kiwix/xapianIndexer.h>
 #include <kiwix/reader.h>
 #include <kiwix/manager.h>
diff --git a/src/installer/meson.build b/src/installer/meson.build
new file mode 100644
index 0000000..78daeda
--- /dev/null
+++ b/src/installer/meson.build
@@ -0,0 +1,3 @@
+executable('kiwix-install', ['kiwix-install.cpp'],
+  dependencies:all_deps,
+  install:true)
diff --git a/src/man/fr/meson.build b/src/man/fr/meson.build
new file mode 100644
index 0000000..a487d99
--- /dev/null
+++ b/src/man/fr/meson.build
@@ -0,0 +1,5 @@
+install_man('kiwix-index.1',
+            'kiwix-install.1',
+            'kiwix-manage.1',
+            'kiwix-serve.1',
+            install_dir:get_option('mandir')+'/fr/man1')
\ No newline at end of file
diff --git a/src/man/meson.build b/src/man/meson.build
new file mode 100644
index 0000000..bfa7099
--- /dev/null
+++ b/src/man/meson.build
@@ -0,0 +1,5 @@
+install_man('kiwix-index.1',
+            'kiwix-install.1',
+            'kiwix-manage.1',
+            'kiwix-serve.1')
+subdir('fr')
diff --git a/src/manager/kiwix-manage.cpp b/src/manager/kiwix-manage.cpp
index dcfb547..41d7e37 100644
--- a/src/manager/kiwix-manage.cpp
+++ b/src/manager/kiwix-manage.cpp
@@ -23,7 +23,7 @@
 #include <getopt.h>
 #include <iostream>
 #include <cstdlib>
-#include <pathTools.h>
+#include <kiwix/common/pathTools.h>
 #include <kiwix/manager.h>
 
 using namespace std;
diff --git a/src/manager/meson.build b/src/manager/meson.build
new file mode 100644
index 0000000..78978c9
--- /dev/null
+++ b/src/manager/meson.build
@@ -0,0 +1,3 @@
+executable('kiwix-manage', ['kiwix-manage.cpp'],
+  dependencies:all_deps,
+  install:true)
diff --git a/src/meson.build b/src/meson.build
index 79d90e0..b768274 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,8 +1,9 @@
 
 
-#subdir('indexer')
-#subdir('installer')
-#subdir('manager')
-#subdir('reader')
-#subdir('searcher')
+subdir('indexer')
+subdir('installer')
+subdir('manager')
+subdir('reader')
+subdir('searcher')
 subdir('server')
+subdir('man')
diff --git a/src/reader/kiwix-read.cpp b/src/reader/kiwix-read.cpp
index 27304e5..eccd23a 100644
--- a/src/reader/kiwix-read.cpp
+++ b/src/reader/kiwix-read.cpp
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <string>
 #include <map>
-#include <tree.h>
+#include <kiwix/common/tree.h>
 #include <kiwix/reader.h>
 
 void usage() {
diff --git a/src/reader/meson.build b/src/reader/meson.build
new file mode 100644
index 0000000..d8c0572
--- /dev/null
+++ b/src/reader/meson.build
@@ -0,0 +1,3 @@
+executable('kiwix-read', ['kiwix-read.cpp'],
+  dependencies:all_deps,
+  install:true)
diff --git a/src/searcher/meson.build b/src/searcher/meson.build
new file mode 100644
index 0000000..922d51a
--- /dev/null
+++ b/src/searcher/meson.build
@@ -0,0 +1,3 @@
+executable('kiwix-search', ['kiwix-search.cpp'],
+  dependencies:all_deps,
+  install:true)