From 5e786d444db492222b878e2f1489348d8cdc8b41 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 6 Oct 2022 16:58:18 +0200
Subject: [PATCH] Meson: Flatten directory hierarchy

Keep tests/ and icons/ but put the rest into the toplevel.

The previous setup was so different from the rest of the bunch that
it regularly stuck out in maintenance tasks.

Change-Id: I69821be6268f69682353a388f6bb1fa343215303
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../mesonprojectmanager/CMakeLists.txt        | 178 ++++++++---------
 .../optionsmodel => }/arrayoptionlineedit.cpp |   0
 .../optionsmodel => }/arrayoptionlineedit.h   |   0
 .../{mesoninfoparser => }/buildoptions.h      |   0
 .../optionsmodel => }/buildoptionsmodel.cpp   |   3 +-
 .../optionsmodel => }/buildoptionsmodel.h     |   2 +-
 .../parsers => }/buildoptionsparser.h         |   4 +-
 .../parsers => }/buildsystemfilesparser.h     |   2 +-
 .../{mesoninfoparser/parsers => }/common.h    |   0
 .../parsers => }/infoparser.h                 |   4 +-
 .../{kithelper => }/kitdata.h                 |   0
 .../{kithelper => }/kithelper.h               |   0
 .../{machinefiles => }/machinefilemanager.cpp |   4 +-
 .../{machinefiles => }/machinefilemanager.h   |   0
 .../mesonactionsmanager.cpp                   |  11 +-
 .../mesonactionsmanager.h                     |   0
 .../{project => }/mesonbuildconfiguration.cpp |   4 +-
 .../{project => }/mesonbuildconfiguration.h   |   2 -
 .../mesonbuildsettingswidget.cpp              |   4 +-
 .../mesonbuildsettingswidget.h                |   2 +-
 .../{project => }/mesonbuildsystem.cpp        |   8 +-
 .../{project => }/mesonbuildsystem.h          |   3 +-
 .../{mesoninfoparser => }/mesoninfo.h         |   0
 .../{mesoninfoparser => }/mesoninfoparser.h   |   8 +-
 .../outputparsers => }/mesonoutputparser.cpp  |   0
 .../outputparsers => }/mesonoutputparser.h    |   0
 .../{project => }/mesonprocess.cpp            |   2 +-
 .../{project => }/mesonprocess.h              |   2 +-
 .../{project => }/mesonproject.cpp            |   4 +-
 .../{project => }/mesonproject.h              |   0
 .../{project => }/mesonprojectimporter.cpp    |   0
 .../{project => }/mesonprojectimporter.h      |   0
 .../mesonprojectmanager.qbs                   | 184 +++++++++---------
 .../projecttree => }/mesonprojectnodes.cpp    |   4 +-
 .../projecttree => }/mesonprojectnodes.h      |   0
 .../{project => }/mesonprojectparser.cpp      |   8 +-
 .../{project => }/mesonprojectparser.h        |  10 +-
 .../mesonprojectplugin.cpp                    |  22 +--
 .../{project => }/mesonrunconfiguration.cpp   |   0
 .../{project => }/mesonrunconfiguration.h     |   0
 .../kitaspect => }/mesontoolkitaspect.cpp     |   0
 .../tools/kitaspect => }/mesontoolkitaspect.h |   2 +-
 .../{exewrappers => }/mesontools.cpp          |   0
 .../{exewrappers => }/mesontools.h            |   0
 .../{exewrappers => }/mesonwrapper.cpp        |   0
 .../{exewrappers => }/mesonwrapper.h          |   2 +-
 .../nativefilegenerator.cpp                   |   2 +-
 .../{machinefiles => }/nativefilegenerator.h  |   2 +-
 .../{project => }/ninjabuildstep.cpp          |   6 +-
 .../{project => }/ninjabuildstep.h            |   2 +-
 .../outputparsers => }/ninjaparser.cpp        |   0
 .../{project/outputparsers => }/ninjaparser.h |   0
 .../kitaspect => }/ninjatoolkitaspect.cpp     |   0
 .../tools/kitaspect => }/ninjatoolkitaspect.h |   2 +-
 .../{exewrappers => }/ninjawrapper.h          |   2 +-
 .../{project/projecttree => }/projecttree.cpp |   0
 .../{project/projecttree => }/projecttree.h   |   2 +-
 .../{settings/general => }/settings.cpp       |   0
 .../{settings/general => }/settings.h         |   0
 .../{mesoninfoparser => }/target.h            |   0
 .../parsers => }/targetparser.h               |   4 +-
 .../tests/testmesoninfoparser.cpp             |   4 +-
 .../tests/testmesonparser.cpp                 |   2 +-
 .../tests/testmesonwrapper.cpp                |   2 +-
 .../tests/testninjaparser.cpp                 |   2 +-
 .../{settings/tools => }/toolitemsettings.cpp |   0
 .../{settings/tools => }/toolitemsettings.h   |   0
 .../kitaspect => }/toolkitaspectwidget.cpp    |   0
 .../kitaspect => }/toolkitaspectwidget.h      |   2 +-
 .../{settings/tools => }/toolsmodel.cpp       |   2 +-
 .../{settings/tools => }/toolsmodel.h         |   2 +-
 .../tools => }/toolssettingsaccessor.cpp      |   0
 .../tools => }/toolssettingsaccessor.h        |   2 +-
 .../tools => }/toolssettingspage.cpp          |   0
 .../{settings/tools => }/toolssettingspage.h  |   0
 .../tools => }/toolssettingswidget.cpp        |   0
 .../tools => }/toolssettingswidget.h          |   0
 .../{settings/tools => }/tooltreeitem.cpp     |   0
 .../{settings/tools => }/tooltreeitem.h       |   2 +-
 .../{exewrappers => }/toolwrapper.cpp         |   0
 .../{exewrappers => }/toolwrapper.h           |   0
 81 files changed, 260 insertions(+), 261 deletions(-)
 rename src/plugins/mesonprojectmanager/{project/buildoptions/optionsmodel => }/arrayoptionlineedit.cpp (100%)
 rename src/plugins/mesonprojectmanager/{project/buildoptions/optionsmodel => }/arrayoptionlineedit.h (100%)
 rename src/plugins/mesonprojectmanager/{mesoninfoparser => }/buildoptions.h (100%)
 rename src/plugins/mesonprojectmanager/{project/buildoptions/optionsmodel => }/buildoptionsmodel.cpp (98%)
 rename src/plugins/mesonprojectmanager/{project/buildoptions/optionsmodel => }/buildoptionsmodel.h (99%)
 rename src/plugins/mesonprojectmanager/{mesoninfoparser/parsers => }/buildoptionsparser.h (98%)
 rename src/plugins/mesonprojectmanager/{mesoninfoparser/parsers => }/buildsystemfilesparser.h (97%)
 rename src/plugins/mesonprojectmanager/{mesoninfoparser/parsers => }/common.h (100%)
 rename src/plugins/mesonprojectmanager/{mesoninfoparser/parsers => }/infoparser.h (95%)
 rename src/plugins/mesonprojectmanager/{kithelper => }/kitdata.h (100%)
 rename src/plugins/mesonprojectmanager/{kithelper => }/kithelper.h (100%)
 rename src/plugins/mesonprojectmanager/{machinefiles => }/machinefilemanager.cpp (98%)
 rename src/plugins/mesonprojectmanager/{machinefiles => }/machinefilemanager.h (100%)
 rename src/plugins/mesonprojectmanager/{mesonactionsmanager => }/mesonactionsmanager.cpp (94%)
 rename src/plugins/mesonprojectmanager/{mesonactionsmanager => }/mesonactionsmanager.h (100%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonbuildconfiguration.cpp (98%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonbuildconfiguration.h (98%)
 rename src/plugins/mesonprojectmanager/{project/buildoptions => }/mesonbuildsettingswidget.cpp (98%)
 rename src/plugins/mesonprojectmanager/{project/buildoptions => }/mesonbuildsettingswidget.h (94%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonbuildsystem.cpp (97%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonbuildsystem.h (96%)
 rename src/plugins/mesonprojectmanager/{mesoninfoparser => }/mesoninfo.h (100%)
 rename src/plugins/mesonprojectmanager/{mesoninfoparser => }/mesoninfoparser.h (91%)
 rename src/plugins/mesonprojectmanager/{project/outputparsers => }/mesonoutputparser.cpp (100%)
 rename src/plugins/mesonprojectmanager/{project/outputparsers => }/mesonoutputparser.h (100%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonprocess.cpp (99%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonprocess.h (97%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonproject.cpp (94%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonproject.h (100%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonprojectimporter.cpp (100%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonprojectimporter.h (100%)
 rename src/plugins/mesonprojectmanager/{project/projecttree => }/mesonprojectnodes.cpp (95%)
 rename src/plugins/mesonprojectmanager/{project/projecttree => }/mesonprojectnodes.h (100%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonprojectparser.cpp (98%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonprojectparser.h (95%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonrunconfiguration.cpp (100%)
 rename src/plugins/mesonprojectmanager/{project => }/mesonrunconfiguration.h (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools/kitaspect => }/mesontoolkitaspect.cpp (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools/kitaspect => }/mesontoolkitaspect.h (97%)
 rename src/plugins/mesonprojectmanager/{exewrappers => }/mesontools.cpp (100%)
 rename src/plugins/mesonprojectmanager/{exewrappers => }/mesontools.h (100%)
 rename src/plugins/mesonprojectmanager/{exewrappers => }/mesonwrapper.cpp (100%)
 rename src/plugins/mesonprojectmanager/{exewrappers => }/mesonwrapper.h (99%)
 rename src/plugins/mesonprojectmanager/{machinefiles => }/nativefilegenerator.cpp (98%)
 rename src/plugins/mesonprojectmanager/{machinefiles => }/nativefilegenerator.h (93%)
 rename src/plugins/mesonprojectmanager/{project => }/ninjabuildstep.cpp (98%)
 rename src/plugins/mesonprojectmanager/{project => }/ninjabuildstep.h (97%)
 rename src/plugins/mesonprojectmanager/{project/outputparsers => }/ninjaparser.cpp (100%)
 rename src/plugins/mesonprojectmanager/{project/outputparsers => }/ninjaparser.h (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools/kitaspect => }/ninjatoolkitaspect.cpp (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools/kitaspect => }/ninjatoolkitaspect.h (97%)
 rename src/plugins/mesonprojectmanager/{exewrappers => }/ninjawrapper.h (97%)
 rename src/plugins/mesonprojectmanager/{project/projecttree => }/projecttree.cpp (100%)
 rename src/plugins/mesonprojectmanager/{project/projecttree => }/projecttree.h (93%)
 rename src/plugins/mesonprojectmanager/{settings/general => }/settings.cpp (100%)
 rename src/plugins/mesonprojectmanager/{settings/general => }/settings.h (100%)
 rename src/plugins/mesonprojectmanager/{mesoninfoparser => }/target.h (100%)
 rename src/plugins/mesonprojectmanager/{mesoninfoparser/parsers => }/targetparser.h (97%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/toolitemsettings.cpp (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/toolitemsettings.h (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools/kitaspect => }/toolkitaspectwidget.cpp (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools/kitaspect => }/toolkitaspectwidget.h (98%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/toolsmodel.cpp (98%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/toolsmodel.h (96%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/toolssettingsaccessor.cpp (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/toolssettingsaccessor.h (94%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/toolssettingspage.cpp (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/toolssettingspage.h (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/toolssettingswidget.cpp (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/toolssettingswidget.h (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/tooltreeitem.cpp (100%)
 rename src/plugins/mesonprojectmanager/{settings/tools => }/tooltreeitem.h (97%)
 rename src/plugins/mesonprojectmanager/{exewrappers => }/toolwrapper.cpp (100%)
 rename src/plugins/mesonprojectmanager/{exewrappers => }/toolwrapper.h (100%)

diff --git a/src/plugins/mesonprojectmanager/CMakeLists.txt b/src/plugins/mesonprojectmanager/CMakeLists.txt
index 3e2a55dfe54..ebb2f4f8621 100644
--- a/src/plugins/mesonprojectmanager/CMakeLists.txt
+++ b/src/plugins/mesonprojectmanager/CMakeLists.txt
@@ -6,80 +6,80 @@ add_qtc_plugin(MesonProjectManager
   mesonprojectplugin.cpp
   mesonprojectplugin.h
   versionhelper.h
-  mesonactionsmanager/mesonactionsmanager.h
-  mesonactionsmanager/mesonactionsmanager.cpp
-  settings/tools/toolsmodel.cpp
-  settings/tools/toolssettingswidget.h
-  settings/tools/toolssettingswidget.cpp
-  settings/tools/toolssettingspage.cpp
-  settings/tools/toolssettingspage.h
-  settings/tools/toolitemsettings.cpp
-  settings/tools/toolitemsettings.h
-  settings/tools/tooltreeitem.cpp
-  settings/tools/tooltreeitem.h
-  settings/tools/toolsmodel.h
-  settings/tools/kitaspect/ninjatoolkitaspect.cpp
-  settings/tools/kitaspect/ninjatoolkitaspect.h
-  settings/tools/kitaspect/toolkitaspectwidget.h
-  settings/tools/kitaspect/toolkitaspectwidget.cpp
-  settings/tools/kitaspect/mesontoolkitaspect.cpp
-  settings/tools/kitaspect/mesontoolkitaspect.h
-  settings/tools/toolssettingsaccessor.h
-  settings/tools/toolssettingsaccessor.cpp
-  settings/general/settings.h
-  settings/general/settings.cpp
-  exewrappers/mesonwrapper.cpp
-  exewrappers/mesonwrapper.h
-  exewrappers/ninjawrapper.h
-  exewrappers/toolwrapper.h
-  exewrappers/toolwrapper.cpp
-  exewrappers/mesontools.h
-  exewrappers/mesontools.cpp
-  mesoninfoparser/mesoninfoparser.h
-  mesoninfoparser/buildoptions.h
-  mesoninfoparser/target.h
-  mesoninfoparser/mesoninfo.h
-  mesoninfoparser/parsers/common.h
-  mesoninfoparser/parsers/buildoptionsparser.h
-  mesoninfoparser/parsers/buildsystemfilesparser.h
-  mesoninfoparser/parsers/infoparser.h
-  mesoninfoparser/parsers/targetparser.h
-  kithelper/kitdata.h
-  kithelper/kithelper.h
-  project/mesonproject.h
-  project/mesonproject.cpp
-  project/mesonprojectimporter.h
-  project/mesonprojectimporter.cpp
-  project/mesonbuildsystem.h
-  project/mesonbuildsystem.cpp
-  project/mesonprojectparser.h
-  project/mesonprojectparser.cpp
-  project/mesonbuildconfiguration.h
-  project/mesonbuildconfiguration.cpp
-  project/ninjabuildstep.h
-  project/ninjabuildstep.cpp
-  project/buildoptions/mesonbuildsettingswidget.h
-  project/buildoptions/mesonbuildsettingswidget.cpp
-  project/buildoptions/optionsmodel/buildoptionsmodel.h
-  project/buildoptions/optionsmodel/buildoptionsmodel.cpp
-  project/buildoptions/optionsmodel/arrayoptionlineedit.cpp
-  project/buildoptions/optionsmodel/arrayoptionlineedit.h
-  project/mesonprocess.h
-  project/mesonprocess.cpp
-  project/outputparsers/mesonoutputparser.h
-  project/outputparsers/mesonoutputparser.cpp
-  project/outputparsers/ninjaparser.h
-  project/outputparsers/ninjaparser.cpp
-  project/mesonrunconfiguration.h
-  project/mesonrunconfiguration.cpp
-  project/projecttree/projecttree.h
-  project/projecttree/projecttree.cpp
-  project/projecttree/mesonprojectnodes.h
-  project/projecttree/mesonprojectnodes.cpp
-  machinefiles/machinefilemanager.h
-  machinefiles/machinefilemanager.cpp
-  machinefiles/nativefilegenerator.h
-  machinefiles/nativefilegenerator.cpp
+  mesonactionsmanager.h
+  mesonactionsmanager.cpp
+  toolsmodel.cpp
+  toolssettingswidget.h
+  toolssettingswidget.cpp
+  toolssettingspage.cpp
+  toolssettingspage.h
+  toolitemsettings.cpp
+  toolitemsettings.h
+  tooltreeitem.cpp
+  tooltreeitem.h
+  toolsmodel.h
+  ninjatoolkitaspect.cpp
+  ninjatoolkitaspect.h
+  toolkitaspectwidget.h
+  toolkitaspectwidget.cpp
+  mesontoolkitaspect.cpp
+  mesontoolkitaspect.h
+  toolssettingsaccessor.h
+  toolssettingsaccessor.cpp
+  settings.h
+  settings.cpp
+  mesonwrapper.cpp
+  mesonwrapper.h
+  ninjawrapper.h
+  toolwrapper.h
+  toolwrapper.cpp
+  mesontools.h
+  mesontools.cpp
+  mesoninfoparser.h
+  buildoptions.h
+  target.h
+  mesoninfo.h
+  common.h
+  buildoptionsparser.h
+  buildsystemfilesparser.h
+  infoparser.h
+  targetparser.h
+  kitdata.h
+  kithelper.h
+  mesonproject.h
+  mesonproject.cpp
+  mesonprojectimporter.h
+  mesonprojectimporter.cpp
+  mesonbuildsystem.h
+  mesonbuildsystem.cpp
+  mesonprojectparser.h
+  mesonprojectparser.cpp
+  mesonbuildconfiguration.h
+  mesonbuildconfiguration.cpp
+  ninjabuildstep.h
+  ninjabuildstep.cpp
+  mesonbuildsettingswidget.h
+  mesonbuildsettingswidget.cpp
+  buildoptionsmodel.h
+  buildoptionsmodel.cpp
+  arrayoptionlineedit.cpp
+  arrayoptionlineedit.h
+  mesonprocess.h
+  mesonprocess.cpp
+  mesonoutputparser.h
+  mesonoutputparser.cpp
+  ninjaparser.h
+  ninjaparser.cpp
+  mesonrunconfiguration.h
+  mesonrunconfiguration.cpp
+  projecttree.h
+  projecttree.cpp
+  mesonprojectnodes.h
+  mesonprojectnodes.cpp
+  machinefilemanager.h
+  machinefilemanager.cpp
+  nativefilegenerator.h
+  nativefilegenerator.cpp
   resources_meson.qrc
 )
 
@@ -100,12 +100,12 @@ add_qtc_test(tst_mesonwrapper
      TEST_RELATIVE_LIBEXEC_PATH="${TEST_RELATIVE_LIBEXEC_PATH}"
   SOURCES
     tests/testmesonwrapper.cpp
-    exewrappers/mesonwrapper.cpp
-    exewrappers/mesonwrapper.h
-    exewrappers/ninjawrapper.h
-    exewrappers/toolwrapper.h
-    exewrappers/toolwrapper.cpp
-    exewrappers/mesontools.h
+    mesonwrapper.cpp
+    mesonwrapper.h
+    ninjawrapper.h
+    toolwrapper.h
+    toolwrapper.cpp
+    mesontools.h
 )
 
 add_qtc_test(tst_mesoninfoparser
@@ -121,13 +121,13 @@ add_qtc_test(tst_mesoninfoparser
      TEST_RELATIVE_LIBEXEC_PATH="${TEST_RELATIVE_LIBEXEC_PATH}"
   SOURCES
     tests/testmesoninfoparser.cpp
-    exewrappers/mesonwrapper.cpp
-    exewrappers/mesonwrapper.h
-    exewrappers/ninjawrapper.h
-    exewrappers/toolwrapper.h
-    exewrappers/toolwrapper.cpp
-    exewrappers/mesontools.h
-    mesoninfoparser/mesoninfoparser.h
+    mesonwrapper.cpp
+    mesonwrapper.h
+    ninjawrapper.h
+    toolwrapper.h
+    toolwrapper.cpp
+    mesontools.h
+    mesoninfoparser.h
 )
 
 add_qtc_test(tst_ninjaparser
@@ -138,7 +138,7 @@ add_qtc_test(tst_ninjaparser
     Utils ProjectExplorer
   SOURCES
     tests/testninjaparser.cpp
-    project/outputparsers/ninjaparser.cpp
+    ninjaparser.cpp
 )
 
 add_qtc_test(tst_mesonparser
@@ -151,7 +151,7 @@ add_qtc_test(tst_mesonparser
     Utils ProjectExplorer
   SOURCES
     tests/testmesonparser.cpp
-    project/outputparsers/mesonoutputparser.cpp
+    mesonoutputparser.cpp
 )
 
 
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.cpp b/src/plugins/mesonprojectmanager/arrayoptionlineedit.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.cpp
rename to src/plugins/mesonprojectmanager/arrayoptionlineedit.cpp
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.h b/src/plugins/mesonprojectmanager/arrayoptionlineedit.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/arrayoptionlineedit.h
rename to src/plugins/mesonprojectmanager/arrayoptionlineedit.h
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h b/src/plugins/mesonprojectmanager/buildoptions.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h
rename to src/plugins/mesonprojectmanager/buildoptions.h
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.cpp b/src/plugins/mesonprojectmanager/buildoptionsmodel.cpp
similarity index 98%
rename from src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.cpp
rename to src/plugins/mesonprojectmanager/buildoptionsmodel.cpp
index 14fc20bbb1b..4803146ad3d 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.cpp
+++ b/src/plugins/mesonprojectmanager/buildoptionsmodel.cpp
@@ -4,6 +4,7 @@
 #include "buildoptionsmodel.h"
 
 #include "arrayoptionlineedit.h"
+#include "mesonprojectmanagertr.h"
 
 #include <QComboBox>
 #include <QLabel>
@@ -27,7 +28,7 @@ inline Utils::TreeItem *makeBuildOptionTreeItem(CancellableOption *buildOption)
 BuidOptionsModel::BuidOptionsModel(QObject *parent)
     : Utils::TreeModel<>(parent)
 {
-    setHeader({tr("Key"), tr("Value")});
+    setHeader({Tr::tr("Key"), Tr::tr("Value")});
 }
 
 inline void groupPerSubprojectAndSection(
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h b/src/plugins/mesonprojectmanager/buildoptionsmodel.h
similarity index 99%
rename from src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h
rename to src/plugins/mesonprojectmanager/buildoptionsmodel.h
index 895a346ff49..3b951c65460 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h
+++ b/src/plugins/mesonprojectmanager/buildoptionsmodel.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "mesoninfoparser/mesoninfoparser.h"
+#include "mesoninfoparser.h"
 
 #include <utils/qtcassert.h>
 #include <utils/treemodel.h>
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildoptionsparser.h b/src/plugins/mesonprojectmanager/buildoptionsparser.h
similarity index 98%
rename from src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildoptionsparser.h
rename to src/plugins/mesonprojectmanager/buildoptionsparser.h
index edcda1b9fb6..26098cf7635 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildoptionsparser.h
+++ b/src/plugins/mesonprojectmanager/buildoptionsparser.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "../../mesonpluginconstants.h"
-#include "../buildoptions.h"
+#include "buildoptions.h"
 #include "common.h"
+#include "mesonpluginconstants.h"
 
 #include <QFile>
 #include <QJsonArray>
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h b/src/plugins/mesonprojectmanager/buildsystemfilesparser.h
similarity index 97%
rename from src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h
rename to src/plugins/mesonprojectmanager/buildsystemfilesparser.h
index 0856dac4eed..b50f9b47c5d 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h
+++ b/src/plugins/mesonprojectmanager/buildsystemfilesparser.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "../../mesonpluginconstants.h"
 #include "common.h"
+#include "mesonpluginconstants.h"
 
 #include <utils/fileutils.h>
 
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/common.h b/src/plugins/mesonprojectmanager/common.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/mesoninfoparser/parsers/common.h
rename to src/plugins/mesonprojectmanager/common.h
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/infoparser.h b/src/plugins/mesonprojectmanager/infoparser.h
similarity index 95%
rename from src/plugins/mesonprojectmanager/mesoninfoparser/parsers/infoparser.h
rename to src/plugins/mesonprojectmanager/infoparser.h
index d016aa6771e..725e31a5e7c 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/infoparser.h
+++ b/src/plugins/mesonprojectmanager/infoparser.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "../../mesonpluginconstants.h"
-#include "../mesoninfo.h"
+#include "mesoninfo.h"
+#include "mesonpluginconstants.h"
 
 #include <QFile>
 #include <QJsonArray>
diff --git a/src/plugins/mesonprojectmanager/kithelper/kitdata.h b/src/plugins/mesonprojectmanager/kitdata.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/kithelper/kitdata.h
rename to src/plugins/mesonprojectmanager/kitdata.h
diff --git a/src/plugins/mesonprojectmanager/kithelper/kithelper.h b/src/plugins/mesonprojectmanager/kithelper.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/kithelper/kithelper.h
rename to src/plugins/mesonprojectmanager/kithelper.h
diff --git a/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.cpp b/src/plugins/mesonprojectmanager/machinefilemanager.cpp
similarity index 98%
rename from src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.cpp
rename to src/plugins/mesonprojectmanager/machinefilemanager.cpp
index 0bfb4820492..b39b0920778 100644
--- a/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.cpp
+++ b/src/plugins/mesonprojectmanager/machinefilemanager.cpp
@@ -3,8 +3,8 @@
 
 #include "machinefilemanager.h"
 
-#include "kithelper/kitdata.h"
-#include "kithelper/kithelper.h"
+#include "kitdata.h"
+#include "kithelper.h"
 #include "nativefilegenerator.h"
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.h b/src/plugins/mesonprojectmanager/machinefilemanager.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/machinefiles/machinefilemanager.h
rename to src/plugins/mesonprojectmanager/machinefilemanager.h
diff --git a/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.cpp b/src/plugins/mesonprojectmanager/mesonactionsmanager.cpp
similarity index 94%
rename from src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.cpp
rename to src/plugins/mesonprojectmanager/mesonactionsmanager.cpp
index 260686314ea..401a4013d2e 100644
--- a/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.cpp
+++ b/src/plugins/mesonprojectmanager/mesonactionsmanager.cpp
@@ -3,13 +3,14 @@
 
 #include "mesonactionsmanager.h"
 
+#include "mesonbuildsystem.h"
+#include "mesonprojectmanagertr.h"
+#include "mesonprojectnodes.h"
+
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 
-#include <project/mesonbuildsystem.h>
-#include <project/projecttree/mesonprojectnodes.h>
-
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projecttree.h>
@@ -20,8 +21,8 @@ namespace MesonProjectManager {
 namespace Internal {
 
 MesonActionsManager::MesonActionsManager()
-    : configureActionMenu(tr("Configure"))
-    , configureActionContextMenu(tr("Configure"))
+    : configureActionMenu(Tr::tr("Configure"))
+    , configureActionContextMenu(Tr::tr("Configure"))
 {
     const Core::Context globalContext(Core::Constants::C_GLOBAL);
     const Core::Context projectContext{Constants::Project::ID};
diff --git a/src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.h b/src/plugins/mesonprojectmanager/mesonactionsmanager.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/mesonactionsmanager/mesonactionsmanager.h
rename to src/plugins/mesonprojectmanager/mesonactionsmanager.h
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
similarity index 98%
rename from src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
rename to src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
index 7531ebb2fb0..91e154cfe47 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
@@ -3,11 +3,11 @@
 
 #include "mesonbuildconfiguration.h"
 
-#include "buildoptions/mesonbuildsettingswidget.h"
-#include "exewrappers/mesonwrapper.h"
+#include "mesonbuildsettingswidget.h"
 #include "mesonbuildsystem.h"
 #include "mesonpluginconstants.h"
 #include "mesonpluginconstants.h"
+#include "mesonwrapper.h"
 #include "ninjabuildstep.h"
 
 #include <projectexplorer/buildinfo.h>
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h
similarity index 98%
rename from src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
rename to src/plugins/mesonprojectmanager/mesonbuildconfiguration.h
index 84b7ec96e16..a8d9b582b8d 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
+++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h
@@ -4,8 +4,6 @@
 
 #include "projectexplorer/buildconfiguration.h"
 #include "projectexplorer/target.h"
-#include "utils/fileutils.h"
-#include <QString>
 
 namespace MesonProjectManager {
 namespace Internal {
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.cpp b/src/plugins/mesonprojectmanager/mesonbuildsettingswidget.cpp
similarity index 98%
rename from src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.cpp
rename to src/plugins/mesonprojectmanager/mesonbuildsettingswidget.cpp
index c3852917310..8bd682a7bc4 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.cpp
+++ b/src/plugins/mesonprojectmanager/mesonbuildsettingswidget.cpp
@@ -3,8 +3,8 @@
 
 #include "mesonbuildsettingswidget.h"
 
-#include "../mesonbuildconfiguration.h"
-#include "../mesonbuildsystem.h"
+#include "mesonbuildconfiguration.h"
+#include "mesonbuildsystem.h"
 
 #include <coreplugin/find/itemviewfind.h>
 
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h b/src/plugins/mesonprojectmanager/mesonbuildsettingswidget.h
similarity index 94%
rename from src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
rename to src/plugins/mesonprojectmanager/mesonbuildsettingswidget.h
index 52752285350..29680ce79a6 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
+++ b/src/plugins/mesonprojectmanager/mesonbuildsettingswidget.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "optionsmodel/buildoptionsmodel.h"
+#include "buildoptionsmodel.h"
 
 #include <projectexplorer/namedwidget.h>
 
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildsystem.cpp b/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp
similarity index 97%
rename from src/plugins/mesonprojectmanager/project/mesonbuildsystem.cpp
rename to src/plugins/mesonprojectmanager/mesonbuildsystem.cpp
index 555e6db6e2a..5aa27323f9f 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildsystem.cpp
+++ b/src/plugins/mesonprojectmanager/mesonbuildsystem.cpp
@@ -3,11 +3,11 @@
 
 #include "mesonbuildsystem.h"
 
+#include "kithelper.h"
+#include "machinefilemanager.h"
 #include "mesonbuildconfiguration.h"
-#include "kithelper/kithelper.h"
-#include "machinefiles/machinefilemanager.h"
-#include "settings/general/settings.h"
-#include "settings/tools/kitaspect/mesontoolkitaspect.h"
+#include "mesontoolkitaspect.h"
+#include "settings.h"
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/taskhub.h>
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildsystem.h b/src/plugins/mesonprojectmanager/mesonbuildsystem.h
similarity index 96%
rename from src/plugins/mesonprojectmanager/project/mesonbuildsystem.h
rename to src/plugins/mesonprojectmanager/mesonbuildsystem.h
index 0fc5a7d415f..1919936b74c 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildsystem.h
+++ b/src/plugins/mesonprojectmanager/mesonbuildsystem.h
@@ -4,8 +4,7 @@
 #pragma once
 
 #include "mesonprojectparser.h"
-#include "exewrappers/mesonwrapper.h"
-#include "kithelper/kitdata.h"
+#include "kitdata.h"
 
 #include <cppeditor/cppprojectupdater.h>
 
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfo.h b/src/plugins/mesonprojectmanager/mesoninfo.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfo.h
rename to src/plugins/mesonprojectmanager/mesoninfo.h
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfoparser.h b/src/plugins/mesonprojectmanager/mesoninfoparser.h
similarity index 91%
rename from src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfoparser.h
rename to src/plugins/mesonprojectmanager/mesoninfoparser.h
index 6833ea253e5..031dcb2673e 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/mesoninfoparser.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser.h
@@ -4,12 +4,12 @@
 #pragma once
 
 #include "buildoptions.h"
+#include "buildoptionsparser.h"
+#include "buildsystemfilesparser.h"
+#include "infoparser.h"
 #include "mesoninfo.h"
-#include "parsers/buildoptionsparser.h"
-#include "parsers/buildsystemfilesparser.h"
-#include "parsers/infoparser.h"
-#include "parsers/targetparser.h"
 #include "target.h"
+#include "targetparser.h"
 
 #include <utils/fileutils.h>
 
diff --git a/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp b/src/plugins/mesonprojectmanager/mesonoutputparser.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.cpp
rename to src/plugins/mesonprojectmanager/mesonoutputparser.cpp
diff --git a/src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.h b/src/plugins/mesonprojectmanager/mesonoutputparser.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/outputparsers/mesonoutputparser.h
rename to src/plugins/mesonprojectmanager/mesonoutputparser.h
diff --git a/src/plugins/mesonprojectmanager/project/mesonprocess.cpp b/src/plugins/mesonprojectmanager/mesonprocess.cpp
similarity index 99%
rename from src/plugins/mesonprojectmanager/project/mesonprocess.cpp
rename to src/plugins/mesonprojectmanager/mesonprocess.cpp
index d517993648a..ffd23761b04 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprocess.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprocess.cpp
@@ -3,7 +3,7 @@
 
 #include "mesonprocess.h"
 
-#include "outputparsers/mesonoutputparser.h"
+#include "mesonoutputparser.h"
 
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
diff --git a/src/plugins/mesonprojectmanager/project/mesonprocess.h b/src/plugins/mesonprojectmanager/mesonprocess.h
similarity index 97%
rename from src/plugins/mesonprojectmanager/project/mesonprocess.h
rename to src/plugins/mesonprojectmanager/mesonprocess.h
index 9a0dc97f97c..87063288103 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprocess.h
+++ b/src/plugins/mesonprojectmanager/mesonprocess.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesonwrapper.h"
+#include "mesonwrapper.h"
 
 #include <QByteArray>
 #include <QElapsedTimer>
diff --git a/src/plugins/mesonprojectmanager/project/mesonproject.cpp b/src/plugins/mesonprojectmanager/mesonproject.cpp
similarity index 94%
rename from src/plugins/mesonprojectmanager/project/mesonproject.cpp
rename to src/plugins/mesonprojectmanager/mesonproject.cpp
index d21802d97c6..a8857ba94df 100644
--- a/src/plugins/mesonprojectmanager/project/mesonproject.cpp
+++ b/src/plugins/mesonprojectmanager/mesonproject.cpp
@@ -4,8 +4,8 @@
 #include "mesonproject.h"
 
 #include "mesonpluginconstants.h"
-#include "settings/tools/kitaspect/mesontoolkitaspect.h"
-#include "settings/tools/kitaspect/ninjatoolkitaspect.h"
+#include "mesontoolkitaspect.h"
+#include "ninjatoolkitaspect.h"
 
 #include <coreplugin/icontext.h>
 
diff --git a/src/plugins/mesonprojectmanager/project/mesonproject.h b/src/plugins/mesonprojectmanager/mesonproject.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/mesonproject.h
rename to src/plugins/mesonprojectmanager/mesonproject.h
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectimporter.cpp b/src/plugins/mesonprojectmanager/mesonprojectimporter.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/mesonprojectimporter.cpp
rename to src/plugins/mesonprojectmanager/mesonprojectimporter.cpp
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectimporter.h b/src/plugins/mesonprojectmanager/mesonprojectimporter.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/mesonprojectimporter.h
rename to src/plugins/mesonprojectmanager/mesonprojectimporter.h
diff --git a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs
index bc7e9361947..8334e6de0a3 100644
--- a/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs
+++ b/src/plugins/mesonprojectmanager/mesonprojectmanager.qbs
@@ -20,84 +20,84 @@ Project {
         cpp.includePaths: "."
 
         files: [
-            "exewrappers/mesontools.cpp",
-            "exewrappers/mesontools.h",
-            "exewrappers/mesonwrapper.cpp",
-            "exewrappers/mesonwrapper.h",
-            "exewrappers/ninjawrapper.h",
-            "exewrappers/toolwrapper.cpp",
-            "exewrappers/toolwrapper.h",
-            "kithelper/kitdata.h",
-            "kithelper/kithelper.h",
-            "machinefiles/machinefilemanager.cpp",
-            "machinefiles/machinefilemanager.h",
-            "machinefiles/nativefilegenerator.cpp",
-            "machinefiles/nativefilegenerator.h",
-            "mesonactionsmanager/mesonactionsmanager.cpp",
-            "mesonactionsmanager/mesonactionsmanager.h",
-            "mesoninfoparser/buildoptions.h",
-            "mesoninfoparser/mesoninfo.h",
-            "mesoninfoparser/mesoninfoparser.h",
-            "mesoninfoparser/parsers/buildoptionsparser.h",
-            "mesoninfoparser/parsers/buildsystemfilesparser.h",
-            "mesoninfoparser/parsers/common.h",
-            "mesoninfoparser/parsers/infoparser.h",
-            "mesoninfoparser/parsers/targetparser.h",
-            "mesoninfoparser/target.h",
+            "mesontools.cpp",
+            "mesontools.h",
+            "mesonwrapper.cpp",
+            "mesonwrapper.h",
+            "ninjawrapper.h",
+            "toolwrapper.cpp",
+            "toolwrapper.h",
+            "kitdata.h",
+            "kithelper.h",
+            "machinefilemanager.cpp",
+            "machinefilemanager.h",
+            "nativefilegenerator.cpp",
+            "nativefilegenerator.h",
+            "mesonactionsmanager.cpp",
+            "mesonactionsmanager.h",
+            "buildoptions.h",
+            "mesoninfo.h",
+            "mesoninfoparser.h",
+            "buildoptionsparser.h",
+            "buildsystemfilesparser.h",
+            "common.h",
+            "infoparser.h",
+            "targetparser.h",
+            "target.h",
             "mesonpluginconstants.h",
             "mesonprojectplugin.cpp",
             "mesonprojectplugin.h",
-            "project/buildoptions/mesonbuildsettingswidget.cpp",
-            "project/buildoptions/mesonbuildsettingswidget.h",
-            "project/buildoptions/optionsmodel/arrayoptionlineedit.cpp",
-            "project/buildoptions/optionsmodel/arrayoptionlineedit.h",
-            "project/buildoptions/optionsmodel/buildoptionsmodel.cpp",
-            "project/buildoptions/optionsmodel/buildoptionsmodel.h",
-            "project/mesonbuildconfiguration.cpp",
-            "project/mesonbuildconfiguration.h",
-            "project/mesonbuildsystem.cpp",
-            "project/mesonbuildsystem.h",
-            "project/mesonprocess.cpp",
-            "project/mesonprocess.h",
-            "project/mesonproject.cpp",
-            "project/mesonproject.h",
-            "project/mesonprojectimporter.cpp",
-            "project/mesonprojectimporter.h",
-            "project/mesonprojectparser.cpp",
-            "project/mesonprojectparser.h",
-            "project/mesonrunconfiguration.cpp",
-            "project/mesonrunconfiguration.h",
-            "project/ninjabuildstep.cpp",
-            "project/ninjabuildstep.h",
-            "project/outputparsers/mesonoutputparser.cpp",
-            "project/outputparsers/mesonoutputparser.h",
-            "project/outputparsers/ninjaparser.cpp",
-            "project/outputparsers/ninjaparser.h",
-            "project/projecttree/mesonprojectnodes.cpp",
-            "project/projecttree/mesonprojectnodes.h",
-            "project/projecttree/projecttree.cpp",
-            "project/projecttree/projecttree.h",
+            "mesonbuildsettingswidget.cpp",
+            "mesonbuildsettingswidget.h",
+            "arrayoptionlineedit.cpp",
+            "arrayoptionlineedit.h",
+            "buildoptionsmodel.cpp",
+            "buildoptionsmodel.h",
+            "mesonbuildconfiguration.cpp",
+            "mesonbuildconfiguration.h",
+            "mesonbuildsystem.cpp",
+            "mesonbuildsystem.h",
+            "mesonprocess.cpp",
+            "mesonprocess.h",
+            "mesonproject.cpp",
+            "mesonproject.h",
+            "mesonprojectimporter.cpp",
+            "mesonprojectimporter.h",
+            "mesonprojectparser.cpp",
+            "mesonprojectparser.h",
+            "mesonrunconfiguration.cpp",
+            "mesonrunconfiguration.h",
+            "ninjabuildstep.cpp",
+            "ninjabuildstep.h",
+            "mesonoutputparser.cpp",
+            "mesonoutputparser.h",
+            "ninjaparser.cpp",
+            "ninjaparser.h",
+            "mesonprojectnodes.cpp",
+            "mesonprojectnodes.h",
+            "projecttree.cpp",
+            "projecttree.h",
             "resources_meson.qrc",
-            "settings/general/settings.cpp",
-            "settings/general/settings.h",
-            "settings/tools/kitaspect/mesontoolkitaspect.cpp",
-            "settings/tools/kitaspect/mesontoolkitaspect.h",
-            "settings/tools/kitaspect/ninjatoolkitaspect.cpp",
-            "settings/tools/kitaspect/ninjatoolkitaspect.h",
-            "settings/tools/kitaspect/toolkitaspectwidget.cpp",
-            "settings/tools/kitaspect/toolkitaspectwidget.h",
-            "settings/tools/toolitemsettings.cpp",
-            "settings/tools/toolitemsettings.h",
-            "settings/tools/toolsmodel.cpp",
-            "settings/tools/toolsmodel.h",
-            "settings/tools/toolssettingsaccessor.cpp",
-            "settings/tools/toolssettingsaccessor.h",
-            "settings/tools/toolssettingspage.cpp",
-            "settings/tools/toolssettingspage.h",
-            "settings/tools/toolssettingswidget.cpp",
-            "settings/tools/toolssettingswidget.h",
-            "settings/tools/tooltreeitem.cpp",
-            "settings/tools/tooltreeitem.h",
+            "settings.cpp",
+            "settings.h",
+            "mesontoolkitaspect.cpp",
+            "mesontoolkitaspect.h",
+            "ninjatoolkitaspect.cpp",
+            "ninjatoolkitaspect.h",
+            "toolkitaspectwidget.cpp",
+            "toolkitaspectwidget.h",
+            "toolitemsettings.cpp",
+            "toolitemsettings.h",
+            "toolsmodel.cpp",
+            "toolsmodel.h",
+            "toolssettingsaccessor.cpp",
+            "toolssettingsaccessor.h",
+            "toolssettingspage.cpp",
+            "toolssettingspage.h",
+            "toolssettingswidget.cpp",
+            "toolssettingswidget.h",
+            "tooltreeitem.cpp",
+            "tooltreeitem.h",
             "versionhelper.h",
         ]
     }
@@ -113,12 +113,12 @@ Project {
         cpp.includePaths: "."
 
         files: [
-            "exewrappers/mesonwrapper.cpp",
-            "exewrappers/mesonwrapper.h",
-            "exewrappers/ninjawrapper.h",
-            "exewrappers/toolwrapper.h",
-            "exewrappers/toolwrapper.cpp",
-            "exewrappers/mesontools.h",
+            "mesonwrapper.cpp",
+            "mesonwrapper.h",
+            "ninjawrapper.h",
+            "toolwrapper.h",
+            "toolwrapper.cpp",
+            "mesontools.h",
             "tests/testmesonwrapper.cpp",
         ]
     }
@@ -134,13 +134,13 @@ Project {
         cpp.includePaths: "."
 
         files: [
-            "exewrappers/mesonwrapper.cpp",
-            "exewrappers/mesonwrapper.h",
-            "exewrappers/ninjawrapper.h",
-            "exewrappers/toolwrapper.h",
-            "exewrappers/toolwrapper.cpp",
-            "exewrappers/mesontools.h",
-            "mesoninfoparser/mesoninfoparser.h",
+            "mesonwrapper.cpp",
+            "mesonwrapper.h",
+            "ninjawrapper.h",
+            "toolwrapper.h",
+            "toolwrapper.cpp",
+            "mesontools.h",
+            "mesoninfoparser.h",
             "tests/testmesoninfoparser.cpp",
         ]
     }
@@ -156,9 +156,9 @@ Project {
         cpp.includePaths: "."
 
         files: [
-            "project/outputparsers/ninjaparser.cpp",
-            "project/outputparsers/ninjaparser.h",
-            "mesoninfoparser/mesoninfoparser.h",
+            "ninjaparser.cpp",
+            "ninjaparser.h",
+            "mesoninfoparser.h",
             "tests/testninjaparser.cpp",
         ]
     }
@@ -175,8 +175,8 @@ Project {
         cpp.includePaths: "."
 
         files: [
-            "project/outputparsers/mesonoutputparser.h",
-            "project/outputparsers/mesonoutputparser.cpp",
+            "mesonoutputparser.h",
+            "mesonoutputparser.cpp",
             "tests/testmesonparser.cpp",
         ]
     }
diff --git a/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.cpp b/src/plugins/mesonprojectmanager/mesonprojectnodes.cpp
similarity index 95%
rename from src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.cpp
rename to src/plugins/mesonprojectmanager/mesonprojectnodes.cpp
index a21b859a8d4..f4009dd51cc 100644
--- a/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprojectnodes.cpp
@@ -3,8 +3,8 @@
 
 #include "mesonprojectnodes.h"
 
-#include "project/mesonbuildconfiguration.h"
-#include "project/mesonbuildsystem.h"
+#include "mesonbuildconfiguration.h"
+#include "mesonbuildsystem.h"
 #include "mesonpluginconstants.h"
 
 #include <projectexplorer/project.h>
diff --git a/src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.h b/src/plugins/mesonprojectmanager/mesonprojectnodes.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/projecttree/mesonprojectnodes.h
rename to src/plugins/mesonprojectmanager/mesonprojectnodes.h
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
similarity index 98%
rename from src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
rename to src/plugins/mesonprojectmanager/mesonprojectparser.cpp
index 28073d3478d..dfa8da8e172 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
@@ -3,10 +3,10 @@
 
 #include "mesonprojectparser.h"
 
-#include "projecttree/mesonprojectnodes.h"
-#include "projecttree/projecttree.h"
-#include "exewrappers/mesontools.h"
-#include "mesoninfoparser/mesoninfoparser.h"
+#include "mesoninfoparser.h"
+#include "mesonprojectnodes.h"
+#include "mesontools.h"
+#include "projecttree.h"
 
 #include <coreplugin/messagemanager.h>
 
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h b/src/plugins/mesonprojectmanager/mesonprojectparser.h
similarity index 95%
rename from src/plugins/mesonprojectmanager/project/mesonprojectparser.h
rename to src/plugins/mesonprojectmanager/mesonprojectparser.h
index 051c05b117e..b5f669361b9 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
+++ b/src/plugins/mesonprojectmanager/mesonprojectparser.h
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "exewrappers/mesonwrapper.h"
-#include "kithelper/kitdata.h"
-#include "mesoninfoparser/mesoninfoparser.h"
+#include "kitdata.h"
+#include "mesoninfoparser.h"
+#include "mesonoutputparser.h"
 #include "mesonprocess.h"
-#include "outputparsers/mesonoutputparser.h"
-#include "projecttree/mesonprojectnodes.h"
+#include "mesonprojectnodes.h"
+#include "mesonwrapper.h"
 
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/kit.h>
diff --git a/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp b/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp
index 62744dfcb25..5cbfcd26224 100644
--- a/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprojectplugin.cpp
@@ -3,17 +3,17 @@
 
 #include "mesonprojectplugin.h"
 
-#include "machinefiles/machinefilemanager.h"
-#include "mesonactionsmanager/mesonactionsmanager.h"
-#include "project/mesonbuildconfiguration.h"
-#include "project/mesonproject.h"
-#include "project/mesonrunconfiguration.h"
-#include "project/ninjabuildstep.h"
-#include "settings/general/settings.h"
-#include "settings/tools/kitaspect/mesontoolkitaspect.h"
-#include "settings/tools/kitaspect/ninjatoolkitaspect.h"
-#include "settings/tools/toolssettingsaccessor.h"
-#include "settings/tools/toolssettingspage.h"
+#include "machinefilemanager.h"
+#include "mesonactionsmanager.h"
+#include "mesonbuildconfiguration.h"
+#include "mesonproject.h"
+#include "mesonrunconfiguration.h"
+#include "mesontoolkitaspect.h"
+#include "ninjabuildstep.h"
+#include "ninjatoolkitaspect.h"
+#include "settings.h"
+#include "toolssettingsaccessor.h"
+#include "toolssettingspage.h"
 
 #include <coreplugin/icore.h>
 
diff --git a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp b/src/plugins/mesonprojectmanager/mesonrunconfiguration.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
rename to src/plugins/mesonprojectmanager/mesonrunconfiguration.cpp
diff --git a/src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h b/src/plugins/mesonprojectmanager/mesonrunconfiguration.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
rename to src/plugins/mesonprojectmanager/mesonrunconfiguration.h
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp b/src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
rename to src/plugins/mesonprojectmanager/mesontoolkitaspect.cpp
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h b/src/plugins/mesonprojectmanager/mesontoolkitaspect.h
similarity index 97%
rename from src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
rename to src/plugins/mesonprojectmanager/mesontoolkitaspect.h
index a91596a0d3f..9f5c37f4bbe 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
+++ b/src/plugins/mesonprojectmanager/mesontoolkitaspect.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp b/src/plugins/mesonprojectmanager/mesontools.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
rename to src/plugins/mesonprojectmanager/mesontools.cpp
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesontools.h b/src/plugins/mesonprojectmanager/mesontools.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/exewrappers/mesontools.h
rename to src/plugins/mesonprojectmanager/mesontools.h
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.cpp b/src/plugins/mesonprojectmanager/mesonwrapper.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.cpp
rename to src/plugins/mesonprojectmanager/mesonwrapper.cpp
diff --git a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h b/src/plugins/mesonprojectmanager/mesonwrapper.h
similarity index 99%
rename from src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
rename to src/plugins/mesonprojectmanager/mesonwrapper.h
index 72a7f135888..d1f399b2240 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
+++ b/src/plugins/mesonprojectmanager/mesonwrapper.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../mesonpluginconstants.h"
+#include "mesonpluginconstants.h"
 #include "toolwrapper.h"
 
 #include <utils/environment.h>
diff --git a/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.cpp b/src/plugins/mesonprojectmanager/nativefilegenerator.cpp
similarity index 98%
rename from src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.cpp
rename to src/plugins/mesonprojectmanager/nativefilegenerator.cpp
index 72ac455c0aa..d434a07815f 100644
--- a/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.cpp
+++ b/src/plugins/mesonprojectmanager/nativefilegenerator.cpp
@@ -3,7 +3,7 @@
 
 #include "nativefilegenerator.h"
 
-#include "kithelper/kithelper.h"
+#include "kithelper.h"
 
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/kitmanager.h>
diff --git a/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.h b/src/plugins/mesonprojectmanager/nativefilegenerator.h
similarity index 93%
rename from src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.h
rename to src/plugins/mesonprojectmanager/nativefilegenerator.h
index 3055583eb69..ee164037015 100644
--- a/src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.h
+++ b/src/plugins/mesonprojectmanager/nativefilegenerator.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "kithelper/kitdata.h"
+#include "kitdata.h"
 
 #include <projectexplorer/kit.h>
 
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
similarity index 98%
rename from src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
rename to src/plugins/mesonprojectmanager/ninjabuildstep.cpp
index 0efa1e96d2d..a09b82c5999 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
+++ b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
@@ -6,9 +6,9 @@
 #include "mesonbuildconfiguration.h"
 #include "mesonbuildsystem.h"
 #include "mesonpluginconstants.h"
-#include "outputparsers/mesonoutputparser.h"
-#include "settings/general/settings.h"
-#include "settings/tools/kitaspect/ninjatoolkitaspect.h"
+#include "mesonoutputparser.h"
+#include "ninjatoolkitaspect.h"
+#include "settings.h"
 
 #include <coreplugin/find/itemviewfind.h>
 
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.h b/src/plugins/mesonprojectmanager/ninjabuildstep.h
similarity index 97%
rename from src/plugins/mesonprojectmanager/project/ninjabuildstep.h
rename to src/plugins/mesonprojectmanager/ninjabuildstep.h
index 498bfe008b4..1657a71ecce 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
+++ b/src/plugins/mesonprojectmanager/ninjabuildstep.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "outputparsers/ninjaparser.h"
+#include "ninjaparser.h"
 
 #include <projectexplorer/abstractprocessstep.h>
 #include <projectexplorer/buildstep.h>
diff --git a/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp b/src/plugins/mesonprojectmanager/ninjaparser.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.cpp
rename to src/plugins/mesonprojectmanager/ninjaparser.cpp
diff --git a/src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.h b/src/plugins/mesonprojectmanager/ninjaparser.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/outputparsers/ninjaparser.h
rename to src/plugins/mesonprojectmanager/ninjaparser.h
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp b/src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
rename to src/plugins/mesonprojectmanager/ninjatoolkitaspect.cpp
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h b/src/plugins/mesonprojectmanager/ninjatoolkitaspect.h
similarity index 97%
rename from src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
rename to src/plugins/mesonprojectmanager/ninjatoolkitaspect.h
index 3fdeaab144b..7a4eed9e030 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
+++ b/src/plugins/mesonprojectmanager/ninjatoolkitaspect.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
diff --git a/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h b/src/plugins/mesonprojectmanager/ninjawrapper.h
similarity index 97%
rename from src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
rename to src/plugins/mesonprojectmanager/ninjawrapper.h
index a67a436bf18..9604728c85c 100644
--- a/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
+++ b/src/plugins/mesonprojectmanager/ninjawrapper.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../mesonpluginconstants.h"
+#include "mesonpluginconstants.h"
 #include "toolwrapper.h"
 
 namespace MesonProjectManager {
diff --git a/src/plugins/mesonprojectmanager/project/projecttree/projecttree.cpp b/src/plugins/mesonprojectmanager/projecttree.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/project/projecttree/projecttree.cpp
rename to src/plugins/mesonprojectmanager/projecttree.cpp
diff --git a/src/plugins/mesonprojectmanager/project/projecttree/projecttree.h b/src/plugins/mesonprojectmanager/projecttree.h
similarity index 93%
rename from src/plugins/mesonprojectmanager/project/projecttree/projecttree.h
rename to src/plugins/mesonprojectmanager/projecttree.h
index a9d7c4c702d..1e4ed92a4fc 100644
--- a/src/plugins/mesonprojectmanager/project/projecttree/projecttree.h
+++ b/src/plugins/mesonprojectmanager/projecttree.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "mesoninfoparser/mesoninfoparser.h"
+#include "mesoninfoparser.h"
 #include "mesonprojectnodes.h"
 
 #include <utils/fileutils.h>
diff --git a/src/plugins/mesonprojectmanager/settings/general/settings.cpp b/src/plugins/mesonprojectmanager/settings.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/general/settings.cpp
rename to src/plugins/mesonprojectmanager/settings.cpp
diff --git a/src/plugins/mesonprojectmanager/settings/general/settings.h b/src/plugins/mesonprojectmanager/settings.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/general/settings.h
rename to src/plugins/mesonprojectmanager/settings.h
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/target.h b/src/plugins/mesonprojectmanager/target.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/mesoninfoparser/target.h
rename to src/plugins/mesonprojectmanager/target.h
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/targetparser.h b/src/plugins/mesonprojectmanager/targetparser.h
similarity index 97%
rename from src/plugins/mesonprojectmanager/mesoninfoparser/parsers/targetparser.h
rename to src/plugins/mesonprojectmanager/targetparser.h
index ae57e6cef1a..ca30221cd36 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/parsers/targetparser.h
+++ b/src/plugins/mesonprojectmanager/targetparser.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "../../mesonpluginconstants.h"
-#include "../target.h"
+#include "mesonpluginconstants.h"
+#include "target.h"
 
 #include <QFile>
 #include <QJsonArray>
diff --git a/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp b/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp
index 1d887d4f1a2..035a2f8a1b7 100644
--- a/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp
+++ b/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp
@@ -1,8 +1,8 @@
 // Copyright (C) 2020 Alexis Jeandet.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
-#include "exewrappers/mesonwrapper.h"
-#include "mesoninfoparser/mesoninfoparser.h"
+#include "mesonwrapper.h"
+#include "mesoninfoparser.h"
 
 #include <utils/launcherinterface.h>
 #include <utils/singleton.h>
diff --git a/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp b/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp
index d3c963b7400..11a1753c885 100644
--- a/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp
+++ b/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Alexis Jeandet.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
-#include "project/outputparsers/mesonoutputparser.h"
+#include "../mesonoutputparser.h"
 
 #include <projectexplorer/taskhub.h>
 
diff --git a/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp b/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp
index 1eb655b7e7b..479f1f8c2bb 100644
--- a/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp
+++ b/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Alexis Jeandet.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
-#include "exewrappers/mesonwrapper.h"
+#include "../mesonwrapper.h"
 
 #include <utils/launcherinterface.h>
 #include <utils/singleton.h>
diff --git a/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp b/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp
index 1d04ff5d068..8f7c38dae93 100644
--- a/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp
+++ b/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Alexis Jeandet.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
-#include "project/outputparsers/ninjaparser.h"
+#include "../ninjaparser.h"
 
 #include <QDir>
 #include <QObject>
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp b/src/plugins/mesonprojectmanager/toolitemsettings.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
rename to src/plugins/mesonprojectmanager/toolitemsettings.cpp
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h b/src/plugins/mesonprojectmanager/toolitemsettings.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
rename to src/plugins/mesonprojectmanager/toolitemsettings.h
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp b/src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
rename to src/plugins/mesonprojectmanager/toolkitaspectwidget.cpp
diff --git a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
similarity index 98%
rename from src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
rename to src/plugins/mesonprojectmanager/toolkitaspectwidget.h
index 209bd634a53..8b389aa0318 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
+++ b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 #pragma once
 
-#include "exewrappers/mesonwrapper.h"
 #include "mesontoolkitaspect.h"
+#include "mesonwrapper.h"
 #include "ninjatoolkitaspect.h"
 
 #include <projectexplorer/kitmanager.h>
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp b/src/plugins/mesonprojectmanager/toolsmodel.cpp
similarity index 98%
rename from src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
rename to src/plugins/mesonprojectmanager/toolsmodel.cpp
index 99539457b75..9c1407387ef 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
+++ b/src/plugins/mesonprojectmanager/toolsmodel.cpp
@@ -4,7 +4,7 @@
 #include "toolsmodel.h"
 
 #include "tooltreeitem.h"
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h b/src/plugins/mesonprojectmanager/toolsmodel.h
similarity index 96%
rename from src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
rename to src/plugins/mesonprojectmanager/toolsmodel.h
index 0e13a234f28..b37dca1015c 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
+++ b/src/plugins/mesonprojectmanager/toolsmodel.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 
 #include <utils/treemodel.h>
 
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.cpp b/src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.cpp
rename to src/plugins/mesonprojectmanager/toolssettingsaccessor.cpp
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.h b/src/plugins/mesonprojectmanager/toolssettingsaccessor.h
similarity index 94%
rename from src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.h
rename to src/plugins/mesonprojectmanager/toolssettingsaccessor.h
index 9f6366c9086..109fa32a15e 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolssettingsaccessor.h
+++ b/src/plugins/mesonprojectmanager/toolssettingsaccessor.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 
 #include <utils/settingsaccessor.h>
 
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.cpp b/src/plugins/mesonprojectmanager/toolssettingspage.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.cpp
rename to src/plugins/mesonprojectmanager/toolssettingspage.cpp
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.h b/src/plugins/mesonprojectmanager/toolssettingspage.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/toolssettingspage.h
rename to src/plugins/mesonprojectmanager/toolssettingspage.h
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.cpp b/src/plugins/mesonprojectmanager/toolssettingswidget.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.cpp
rename to src/plugins/mesonprojectmanager/toolssettingswidget.cpp
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h b/src/plugins/mesonprojectmanager/toolssettingswidget.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/toolssettingswidget.h
rename to src/plugins/mesonprojectmanager/toolssettingswidget.h
diff --git a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp b/src/plugins/mesonprojectmanager/tooltreeitem.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
rename to src/plugins/mesonprojectmanager/tooltreeitem.cpp
diff --git a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h b/src/plugins/mesonprojectmanager/tooltreeitem.h
similarity index 97%
rename from src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
rename to src/plugins/mesonprojectmanager/tooltreeitem.h
index 8c021325100..6e8592bf6f2 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
+++ b/src/plugins/mesonprojectmanager/tooltreeitem.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 #include "toolssettingspage.h"
 
 #include <utils/fileutils.h>
diff --git a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp b/src/plugins/mesonprojectmanager/toolwrapper.cpp
similarity index 100%
rename from src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
rename to src/plugins/mesonprojectmanager/toolwrapper.cpp
diff --git a/src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h b/src/plugins/mesonprojectmanager/toolwrapper.h
similarity index 100%
rename from src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
rename to src/plugins/mesonprojectmanager/toolwrapper.h