diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 3559626d0dd91df5cdf0affcc0cea967bd5a2e21..2a6f286925ef2a17b6cd7adc902fdefbc930fb39 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory( Tools )
+add_subdirectory (cmake)
+add_subdirectory (pkgconfig)
diff --git a/share/Tools/CMakeLists.txt b/share/Tools/CMakeLists.txt
deleted file mode 100644
index 2a6f286925ef2a17b6cd7adc902fdefbc930fb39..0000000000000000000000000000000000000000
--- a/share/Tools/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory (cmake)
-add_subdirectory (pkgconfig)
diff --git a/share/Tools/cmake/CMakeFindTNL.cmake b/share/cmake/CMakeFindTNL.cmake
similarity index 100%
rename from share/Tools/cmake/CMakeFindTNL.cmake
rename to share/cmake/CMakeFindTNL.cmake
diff --git a/share/Tools/cmake/CMakeLists.txt b/share/cmake/CMakeLists.txt
similarity index 100%
rename from share/Tools/cmake/CMakeLists.txt
rename to share/cmake/CMakeLists.txt
diff --git a/share/Tools/pkgconfig/CMakeLists.txt b/share/pkgconfig/CMakeLists.txt
similarity index 100%
rename from share/Tools/pkgconfig/CMakeLists.txt
rename to share/pkgconfig/CMakeLists.txt
diff --git a/share/Tools/pkgconfig/cuda.pc.in b/share/pkgconfig/cuda.pc.in
similarity index 100%
rename from share/Tools/pkgconfig/cuda.pc.in
rename to share/pkgconfig/cuda.pc.in
diff --git a/share/Tools/pkgconfig/tnl-cuda.pc.in b/share/pkgconfig/tnl-cuda.pc.in
similarity index 100%
rename from share/Tools/pkgconfig/tnl-cuda.pc.in
rename to share/pkgconfig/tnl-cuda.pc.in
diff --git a/share/Tools/pkgconfig/tnl-openmp.pc.in b/share/pkgconfig/tnl-openmp.pc.in
similarity index 100%
rename from share/Tools/pkgconfig/tnl-openmp.pc.in
rename to share/pkgconfig/tnl-openmp.pc.in
diff --git a/share/Tools/pkgconfig/tnl.pc.in b/share/pkgconfig/tnl.pc.in
similarity index 100%
rename from share/Tools/pkgconfig/tnl.pc.in
rename to share/pkgconfig/tnl.pc.in