diff --git a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
similarity index 95%
rename from Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
rename to Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
index 9390caeadb8cf4c16a5829a134a13cc05f10de5c..343770056a97c6200819880f011e8d5bebf8717d 100644
--- a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
+++ b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.cpp
+//! @file      Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
 //! @brief     Implements class GSLLevenbergMarquardtMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
+#include "Fit/Adapter/GSLLevenbergMarquardtMinimizer.h"
+#include "Fit/Adapter/GSLMultiMinimizer.h"
 #include "Fit/Tools/MinimizerUtils.h"
 #include "Fit/Tools/StringUtils.h"
 #include <stdexcept>
diff --git a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
similarity index 95%
rename from Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
rename to Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
index 37a421e7a9d8a77f02732be11d909b3888ae4bbe..b28914c583969bda1f0eeef5abdd43d7cfb2161c 100644
--- a/Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
+++ b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h
+//! @file      Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
 //! @brief     Declares class GSLLevenbergMarquardtMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_FIT_ROOTADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
 #define BORNAGAIN_FIT_ROOTADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
 
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
 
 namespace ROOT
 {
diff --git a/Fit/RootAdapter/GSLMultiMinimizer.cpp b/Fit/Adapter/GSLMultiMinimizer.cpp
similarity index 95%
rename from Fit/RootAdapter/GSLMultiMinimizer.cpp
rename to Fit/Adapter/GSLMultiMinimizer.cpp
index 9f08d6243b9731012db8252965e9f322fb7cab38..6fc9071e14d9bc50bf1701898663b749605b82df 100644
--- a/Fit/RootAdapter/GSLMultiMinimizer.cpp
+++ b/Fit/Adapter/GSLMultiMinimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/GSLMultiMinimizer.cpp
+//! @file      Fit/Adapter/GSLMultiMinimizer.cpp
 //! @brief     Implements class GSLMultiMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
+#include "Fit/Adapter/GSLMultiMinimizer.h"
 #include "Fit/Tools/MinimizerUtils.h"
 #include <string>
 
diff --git a/Fit/RootAdapter/GSLMultiMinimizer.h b/Fit/Adapter/GSLMultiMinimizer.h
similarity index 94%
rename from Fit/RootAdapter/GSLMultiMinimizer.h
rename to Fit/Adapter/GSLMultiMinimizer.h
index e9c96ab570ae2f7c915f539541828c62b7b7e30d..3dbda2e465f483ce9cb5e96dda6e9cfb8f255425 100644
--- a/Fit/RootAdapter/GSLMultiMinimizer.h
+++ b/Fit/Adapter/GSLMultiMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/GSLMultiMinimizer.h
+//! @file      Fit/Adapter/GSLMultiMinimizer.h
 //! @brief     Declares class GSLMultiMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_FIT_ROOTADAPTER_GSLMULTIMINIMIZER_H
 #define BORNAGAIN_FIT_ROOTADAPTER_GSLMULTIMINIMIZER_H
 
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
 
 namespace ROOT
 {
diff --git a/Fit/RootAdapter/GeneticMinimizer.cpp b/Fit/Adapter/GeneticMinimizer.cpp
similarity index 97%
rename from Fit/RootAdapter/GeneticMinimizer.cpp
rename to Fit/Adapter/GeneticMinimizer.cpp
index 68035a2740d497ac27edd58498280b7943f780a9..ee97896ab15766036a0038cb03fb563b5b7b602a 100644
--- a/Fit/RootAdapter/GeneticMinimizer.cpp
+++ b/Fit/Adapter/GeneticMinimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/GeneticMinimizer.cpp
+//! @file      Fit/Adapter/GeneticMinimizer.cpp
 //! @brief     Implements class GeneticMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/GeneticMinimizer.h"
+#include "Fit/Adapter/GeneticMinimizer.h"
 #include <Math/GeneticMinimizer.h>
 
 namespace
diff --git a/Fit/RootAdapter/GeneticMinimizer.h b/Fit/Adapter/GeneticMinimizer.h
similarity index 95%
rename from Fit/RootAdapter/GeneticMinimizer.h
rename to Fit/Adapter/GeneticMinimizer.h
index 5606222704d6566b336dc52bda0c6900724fe74c..392335b161be6bd3b42bcff25ba5874f0cb91de5 100644
--- a/Fit/RootAdapter/GeneticMinimizer.h
+++ b/Fit/Adapter/GeneticMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/GeneticMinimizer.h
+//! @file      Fit/Adapter/GeneticMinimizer.h
 //! @brief     Declares class GeneticMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_FIT_ROOTADAPTER_GENETICMINIMIZER_H
 #define BORNAGAIN_FIT_ROOTADAPTER_GENETICMINIMIZER_H
 
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
 
 namespace ROOT
 {
diff --git a/Fit/Kernel/IFunctionAdapter.cpp b/Fit/Adapter/IFunctionAdapter.cpp
similarity index 91%
rename from Fit/Kernel/IFunctionAdapter.cpp
rename to Fit/Adapter/IFunctionAdapter.cpp
index 4d0522c9b3e546741f4ccc110c67d35d15e09239..e07daf6f1ade525ed08ccd0344bdf55e481f5e82 100644
--- a/Fit/Kernel/IFunctionAdapter.cpp
+++ b/Fit/Adapter/IFunctionAdapter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/Kernel/IFunctionAdapter.cpp
+//! @file      Fit/Adapter/IFunctionAdapter.cpp
 //! @brief     Implements interface IFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Kernel/IFunctionAdapter.h"
+#include "Fit/Adapter/IFunctionAdapter.h"
 
 using namespace Fit;
 
diff --git a/Fit/Kernel/IFunctionAdapter.h b/Fit/Adapter/IFunctionAdapter.h
similarity index 96%
rename from Fit/Kernel/IFunctionAdapter.h
rename to Fit/Adapter/IFunctionAdapter.h
index 67a95c58f8b9ce083a867cd7c1a2a6c2b69dbdb3..77a012ee408e6f5f7653fe2891b039d0e02fffe0 100644
--- a/Fit/Kernel/IFunctionAdapter.h
+++ b/Fit/Adapter/IFunctionAdapter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/Kernel/IFunctionAdapter.h
+//! @file      Fit/Adapter/IFunctionAdapter.h
 //! @brief     Defines interface IFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/RootAdapter/Minuit2Minimizer.cpp b/Fit/Adapter/Minuit2Minimizer.cpp
similarity index 98%
rename from Fit/RootAdapter/Minuit2Minimizer.cpp
rename to Fit/Adapter/Minuit2Minimizer.cpp
index 5bc6c7ec89a5d351b03b2548da85307486c1e9b5..b3fc2ec71307ddb42af7e66832d7d0814c831965 100644
--- a/Fit/RootAdapter/Minuit2Minimizer.cpp
+++ b/Fit/Adapter/Minuit2Minimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/Minuit2Minimizer.cpp
+//! @file      Fit/Adapter/Minuit2Minimizer.cpp
 //! @brief     Declares class Minuit2Minimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/Minuit2Minimizer.h"
+#include "Fit/Adapter/Minuit2Minimizer.h"
 #include "Fit/Tools/StringUtils.h"
 #include <Minuit2/Minuit2Minimizer.h>
 
diff --git a/Fit/RootAdapter/Minuit2Minimizer.h b/Fit/Adapter/Minuit2Minimizer.h
similarity index 96%
rename from Fit/RootAdapter/Minuit2Minimizer.h
rename to Fit/Adapter/Minuit2Minimizer.h
index c085b64ef256b75b8deb387688370ed2737e6d55..348ca526f5e10193a28a2ec2873e6be192ae5489 100644
--- a/Fit/RootAdapter/Minuit2Minimizer.h
+++ b/Fit/Adapter/Minuit2Minimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/Minuit2Minimizer.h
+//! @file      Fit/Adapter/Minuit2Minimizer.h
 //! @brief     Declares class Minuit2Minimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_FIT_ROOTADAPTER_MINUIT2MINIMIZER_H
 #define BORNAGAIN_FIT_ROOTADAPTER_MINUIT2MINIMIZER_H
 
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
 #include <memory>
 
 namespace ROOT
diff --git a/Fit/RootAdapter/ObjectiveFunctionAdapter.cpp b/Fit/Adapter/ObjectiveFunctionAdapter.cpp
similarity index 84%
rename from Fit/RootAdapter/ObjectiveFunctionAdapter.cpp
rename to Fit/Adapter/ObjectiveFunctionAdapter.cpp
index 957db3d0ffde264978122e61cbd5bd8f9c3576c3..3bcb12be891440fdbfe146c6c86a5d7fb69b80cf 100644
--- a/Fit/RootAdapter/ObjectiveFunctionAdapter.cpp
+++ b/Fit/Adapter/ObjectiveFunctionAdapter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/ObjectiveFunctionAdapter.cpp
+//! @file      Fit/Adapter/ObjectiveFunctionAdapter.cpp
 //! @brief     Implements class ObjectiveFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/ObjectiveFunctionAdapter.h"
-#include "Fit/RootAdapter/ResidualFunctionAdapter.h"
-#include "Fit/RootAdapter/RootResidualFunction.h"
-#include "Fit/RootAdapter/RootScalarFunction.h"
-#include "Fit/RootAdapter/ScalarFunctionAdapter.h"
+#include "Fit/Adapter/ObjectiveFunctionAdapter.h"
+#include "Fit/Adapter/ResidualFunctionAdapter.h"
+#include "Fit/Adapter/RootResidualFunction.h"
+#include "Fit/Adapter/RootScalarFunction.h"
+#include "Fit/Adapter/ScalarFunctionAdapter.h"
 
 using namespace Fit;
 
diff --git a/Fit/RootAdapter/ObjectiveFunctionAdapter.h b/Fit/Adapter/ObjectiveFunctionAdapter.h
similarity index 96%
rename from Fit/RootAdapter/ObjectiveFunctionAdapter.h
rename to Fit/Adapter/ObjectiveFunctionAdapter.h
index 5ed903878a5076c83dd0e4fd88af4767458d77cd..07e11a0797f75bd9a3f101323161e990a88c5334 100644
--- a/Fit/RootAdapter/ObjectiveFunctionAdapter.h
+++ b/Fit/Adapter/ObjectiveFunctionAdapter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/ObjectiveFunctionAdapter.h
+//! @file      Fit/Adapter/ObjectiveFunctionAdapter.h
 //! @brief     Declares class ObjectiveFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/RootAdapter/ResidualFunctionAdapter.cpp b/Fit/Adapter/ResidualFunctionAdapter.cpp
similarity index 96%
rename from Fit/RootAdapter/ResidualFunctionAdapter.cpp
rename to Fit/Adapter/ResidualFunctionAdapter.cpp
index 9202ddb6f22ad065d042d1ce1462529880a4820f..fa03669372b31bbfdda349949974b4f948d99d20 100644
--- a/Fit/RootAdapter/ResidualFunctionAdapter.cpp
+++ b/Fit/Adapter/ResidualFunctionAdapter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/ResidualFunctionAdapter.cpp
+//! @file      Fit/Adapter/ResidualFunctionAdapter.cpp
 //! @brief     Implements class ResidualFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/ResidualFunctionAdapter.h"
-#include "Fit/RootAdapter/RootResidualFunction.h"
+#include "Fit/Adapter/ResidualFunctionAdapter.h"
+#include "Fit/Adapter/RootResidualFunction.h"
 #include <cassert>
 #include <sstream>
 
diff --git a/Fit/RootAdapter/ResidualFunctionAdapter.h b/Fit/Adapter/ResidualFunctionAdapter.h
similarity index 95%
rename from Fit/RootAdapter/ResidualFunctionAdapter.h
rename to Fit/Adapter/ResidualFunctionAdapter.h
index f5dfbdf84f98399682b1b8bc6a133e1c1f022873..d79660ec4ac5bd450515352687a98478d4f8afab 100644
--- a/Fit/RootAdapter/ResidualFunctionAdapter.h
+++ b/Fit/Adapter/ResidualFunctionAdapter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/ResidualFunctionAdapter.h
+//! @file      Fit/Adapter/ResidualFunctionAdapter.h
 //! @brief     Defines class ResidualFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_FIT_ROOTADAPTER_RESIDUALFUNCTIONADAPTER_H
 #define BORNAGAIN_FIT_ROOTADAPTER_RESIDUALFUNCTIONADAPTER_H
 
-#include "Fit/Kernel/IFunctionAdapter.h"
+#include "Fit/Adapter/IFunctionAdapter.h"
 #include "Fit/Minimizer/Types.h"
 #include "Fit/Param/Parameters.h"
 #include <functional>
diff --git a/Fit/RootAdapter/RootMinimizerAdapter.cpp b/Fit/Adapter/RootMinimizerAdapter.cpp
similarity index 95%
rename from Fit/RootAdapter/RootMinimizerAdapter.cpp
rename to Fit/Adapter/RootMinimizerAdapter.cpp
index 0885b69123af9ec0c2166434968e26c35c902c0e..43bd58aeb61299ce754a0688675fb601b528ad41 100644
--- a/Fit/RootAdapter/RootMinimizerAdapter.cpp
+++ b/Fit/Adapter/RootMinimizerAdapter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/RootMinimizerAdapter.cpp
+//! @file      Fit/Adapter/RootMinimizerAdapter.cpp
 //! @brief     Implements class RootMinimizerAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
-#include "Fit/Kernel/Report.h"
-#include "Fit/RootAdapter/ObjectiveFunctionAdapter.h"
-#include "Fit/RootAdapter/RootResidualFunction.h"
-#include "Fit/RootAdapter/RootScalarFunction.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
+#include "Fit/Report/Report.h"
+#include "Fit/Adapter/ObjectiveFunctionAdapter.h"
+#include "Fit/Adapter/RootResidualFunction.h"
+#include "Fit/Adapter/RootScalarFunction.h"
 #include "Fit/Tools/StringUtils.h"
 #include <Math/Minimizer.h>
 
diff --git a/Fit/RootAdapter/RootMinimizerAdapter.h b/Fit/Adapter/RootMinimizerAdapter.h
similarity index 98%
rename from Fit/RootAdapter/RootMinimizerAdapter.h
rename to Fit/Adapter/RootMinimizerAdapter.h
index 837c2d78d4942bd5679dc5808eb21709226c77af..edfa100d15ae7f8ccf307a72615e1f0511bab602 100644
--- a/Fit/RootAdapter/RootMinimizerAdapter.h
+++ b/Fit/Adapter/RootMinimizerAdapter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/RootMinimizerAdapter.h
+//! @file      Fit/Adapter/RootMinimizerAdapter.h
 //! @brief     Declares class RootMinimizerAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/RootAdapter/RootResidualFunction.cpp b/Fit/Adapter/RootResidualFunction.cpp
similarity index 96%
rename from Fit/RootAdapter/RootResidualFunction.cpp
rename to Fit/Adapter/RootResidualFunction.cpp
index aad061c9cacdc15dcd1e3dcc89475c49e935e236..e6d39a8beb9634d13942ce48e63958f1e4076728 100644
--- a/Fit/RootAdapter/RootResidualFunction.cpp
+++ b/Fit/Adapter/RootResidualFunction.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/RootResidualFunction.cpp
+//! @file      Fit/Adapter/RootResidualFunction.cpp
 //! @brief     Implements class RootResidualFunction.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/RootResidualFunction.h"
+#include "Fit/Adapter/RootResidualFunction.h"
 
 RootResidualFunction::RootResidualFunction(scalar_function_t objective_fun,
                                            gradient_function_t gradient_fun, size_t npars,
diff --git a/Fit/RootAdapter/RootResidualFunction.h b/Fit/Adapter/RootResidualFunction.h
similarity index 97%
rename from Fit/RootAdapter/RootResidualFunction.h
rename to Fit/Adapter/RootResidualFunction.h
index 11c3dd672f63b8e4a8cf51b42d5053cd13bb539b..592fcdf6521dac5862f9d333832b7ec16d08cb9e 100644
--- a/Fit/RootAdapter/RootResidualFunction.h
+++ b/Fit/Adapter/RootResidualFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/RootResidualFunction.h
+//! @file      Fit/Adapter/RootResidualFunction.h
 //! @brief     Declares class RootResidualFunction.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/RootAdapter/RootScalarFunction.cpp b/Fit/Adapter/RootScalarFunction.cpp
similarity index 87%
rename from Fit/RootAdapter/RootScalarFunction.cpp
rename to Fit/Adapter/RootScalarFunction.cpp
index ad30cf6ac7b6386538df51cf6569ff225add05c2..2dc536406196d43dba67dbf064d145369d101e65 100644
--- a/Fit/RootAdapter/RootScalarFunction.cpp
+++ b/Fit/Adapter/RootScalarFunction.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/RootScalarFunction.cpp
+//! @file      Fit/Adapter/RootScalarFunction.cpp
 //! @brief     Implements class RootScalarFunction
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/RootScalarFunction.h"
+#include "Fit/Adapter/RootScalarFunction.h"
 
 RootScalarFunction::RootScalarFunction(root_scalar_t fcn, int ndims)
     : ROOT::Math::Functor(fcn, static_cast<unsigned int>(ndims))
diff --git a/Fit/RootAdapter/RootScalarFunction.h b/Fit/Adapter/RootScalarFunction.h
similarity index 95%
rename from Fit/RootAdapter/RootScalarFunction.h
rename to Fit/Adapter/RootScalarFunction.h
index fd52410a614d30dda92a0bd62d4874c72e93918c..4de94e80e0c1faa9280873ca07794a27536fd253 100644
--- a/Fit/RootAdapter/RootScalarFunction.h
+++ b/Fit/Adapter/RootScalarFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/RootScalarFunction.h
+//! @file      Fit/Adapter/RootScalarFunction.h
 //! @brief     Defines classes RootScalarFunction
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/RootAdapter/ScalarFunctionAdapter.cpp b/Fit/Adapter/ScalarFunctionAdapter.cpp
similarity index 89%
rename from Fit/RootAdapter/ScalarFunctionAdapter.cpp
rename to Fit/Adapter/ScalarFunctionAdapter.cpp
index 082778178579190e939c8339419340902ae4d454..d1bc6e8fbe704047d69b4fc6e13f1ca145400f03 100644
--- a/Fit/RootAdapter/ScalarFunctionAdapter.cpp
+++ b/Fit/Adapter/ScalarFunctionAdapter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/ScalarFunctionAdapter.cpp
+//! @file      Fit/Adapter/ScalarFunctionAdapter.cpp
 //! @brief     Defines class ScalarFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/ScalarFunctionAdapter.h"
-#include "Fit/RootAdapter/RootScalarFunction.h"
+#include "Fit/Adapter/ScalarFunctionAdapter.h"
+#include "Fit/Adapter/RootScalarFunction.h"
 
 using namespace Fit;
 
diff --git a/Fit/RootAdapter/ScalarFunctionAdapter.h b/Fit/Adapter/ScalarFunctionAdapter.h
similarity index 94%
rename from Fit/RootAdapter/ScalarFunctionAdapter.h
rename to Fit/Adapter/ScalarFunctionAdapter.h
index ac733605ab2d9fc2b7159128f5106f86f88ac577..fb534d34ce1c9d82e68e1a2a61ca2c40ea360d91 100644
--- a/Fit/RootAdapter/ScalarFunctionAdapter.h
+++ b/Fit/Adapter/ScalarFunctionAdapter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/ScalarFunctionAdapter.h
+//! @file      Fit/Adapter/ScalarFunctionAdapter.h
 //! @brief     Defines class ScalarFunctionAdapter.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_FIT_ROOTADAPTER_SCALARFUNCTIONADAPTER_H
 #define BORNAGAIN_FIT_ROOTADAPTER_SCALARFUNCTIONADAPTER_H
 
-#include "Fit/Kernel/IFunctionAdapter.h"
+#include "Fit/Adapter/IFunctionAdapter.h"
 #include "Fit/Minimizer/Types.h"
 #include "Fit/Param/Parameters.h"
 #include <functional>
diff --git a/Fit/RootAdapter/SimAnMinimizer.cpp b/Fit/Adapter/SimAnMinimizer.cpp
similarity index 96%
rename from Fit/RootAdapter/SimAnMinimizer.cpp
rename to Fit/Adapter/SimAnMinimizer.cpp
index 1e87a98aad252a1f48efb291f3f2c5e7a97275eb..da202ed8b3ba2376982613e4008771a1e977a1ca 100644
--- a/Fit/RootAdapter/SimAnMinimizer.cpp
+++ b/Fit/Adapter/SimAnMinimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/SimAnMinimizer.cpp
+//! @file      Fit/Adapter/SimAnMinimizer.cpp
 //! @brief     Implements class SimAnMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/RootAdapter/SimAnMinimizer.h"
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
+#include "Fit/Adapter/SimAnMinimizer.h"
+#include "Fit/Adapter/GSLMultiMinimizer.h"
 
 #ifdef _WIN32
 #pragma warning(push)
diff --git a/Fit/RootAdapter/SimAnMinimizer.h b/Fit/Adapter/SimAnMinimizer.h
similarity index 96%
rename from Fit/RootAdapter/SimAnMinimizer.h
rename to Fit/Adapter/SimAnMinimizer.h
index 79832b88c5c10d65bcb120d85a5bf1386e81125c..4bad303f54bc8456eb3e381bd5c81cf6515be046 100644
--- a/Fit/RootAdapter/SimAnMinimizer.h
+++ b/Fit/Adapter/SimAnMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/RootAdapter/SimAnMinimizer.h
+//! @file      Fit/Adapter/SimAnMinimizer.h
 //! @brief     Declares class SimAnMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_FIT_ROOTADAPTER_SIMANMINIMIZER_H
 #define BORNAGAIN_FIT_ROOTADAPTER_SIMANMINIMIZER_H
 
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
 
 namespace ROOT
 {
diff --git a/Fit/Kernel/MinimizerFactory.cpp b/Fit/Kernel/MinimizerFactory.cpp
index 88f6705688ed95f90c133c9c38e435b4e9704c31..95860e3a5cdc990c61c7ec8125d07d2577dc1968 100644
--- a/Fit/Kernel/MinimizerFactory.cpp
+++ b/Fit/Kernel/MinimizerFactory.cpp
@@ -14,11 +14,11 @@
 
 #include "Fit/Kernel/MinimizerFactory.h"
 #include "Fit/Minimizer/TestMinimizer.h"
-#include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
-#include "Fit/RootAdapter/GeneticMinimizer.h"
-#include "Fit/RootAdapter/Minuit2Minimizer.h"
-#include "Fit/RootAdapter/SimAnMinimizer.h"
+#include "Fit/Adapter/GSLLevenbergMarquardtMinimizer.h"
+#include "Fit/Adapter/GSLMultiMinimizer.h"
+#include "Fit/Adapter/GeneticMinimizer.h"
+#include "Fit/Adapter/Minuit2Minimizer.h"
+#include "Fit/Adapter/SimAnMinimizer.h"
 #include <boost/format.hpp>
 #include <iomanip>
 #include <iostream>
diff --git a/Fit/Minimizer/MinimizerResult.cpp b/Fit/Minimizer/MinimizerResult.cpp
index 95bb1aa0c3c08a538df027ee83b35d94deb3d305..2afb998fdebbcb494137eb5cb5e5082f9c4229fe 100644
--- a/Fit/Minimizer/MinimizerResult.cpp
+++ b/Fit/Minimizer/MinimizerResult.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Fit/Minimizer/MinimizerResult.h"
-#include "Fit/Kernel/Report.h"
+#include "Fit/Report/Report.h"
 #include "Fit/Tools/MinimizerUtils.h"
 #include <sstream>
 
diff --git a/Fit/Kernel/Report.cpp b/Fit/Report/Report.cpp
similarity index 96%
rename from Fit/Kernel/Report.cpp
rename to Fit/Report/Report.cpp
index 0b2864daea3660312ec970403eb7db24358c5c1d..33ba199e138395987e2fa957c9c9b43092fc4703 100644
--- a/Fit/Kernel/Report.cpp
+++ b/Fit/Report/Report.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/Kernel/Report.cpp
+//! @file      Fit/Report/Report.cpp
 //! @brief     Implements report namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Kernel/Report.h"
-#include "Fit/RootAdapter/RootMinimizerAdapter.h"
+#include "Fit/Report/Report.h"
+#include "Fit/Adapter/RootMinimizerAdapter.h"
 #include "Fit/Tools/MinimizerUtils.h"
 #include <boost/format.hpp>
 #include <iomanip>
diff --git a/Fit/Kernel/Report.h b/Fit/Report/Report.h
similarity index 97%
rename from Fit/Kernel/Report.h
rename to Fit/Report/Report.h
index 0c520a587cdab13ed62899658e179057389ebb4c..af82f004b65be534eb2b4966126474d6ca9043df 100644
--- a/Fit/Kernel/Report.h
+++ b/Fit/Report/Report.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/Kernel/Report.h
+//! @file      Fit/Report/Report.h
 //! @brief     Declares report namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MinimizerItem.cpp b/GUI/coregui/Models/MinimizerItem.cpp
index 15ae443605d5059eac32b67c5fa5c924e3658d0e..5a7a7c9d6233ff20402c0ea36fb35dde22a279ce 100644
--- a/GUI/coregui/Models/MinimizerItem.cpp
+++ b/GUI/coregui/Models/MinimizerItem.cpp
@@ -16,11 +16,11 @@
 #include "Core/Fitting/ObjectiveMetric.h"
 #include "Core/Fitting/ObjectiveMetricUtils.h"
 #include "Fit/Minimizer/TestMinimizer.h"
-#include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
-#include "Fit/RootAdapter/GSLMultiMinimizer.h"
-#include "Fit/RootAdapter/GeneticMinimizer.h"
-#include "Fit/RootAdapter/Minuit2Minimizer.h"
-#include "Fit/RootAdapter/SimAnMinimizer.h"
+#include "Fit/Adapter/GSLLevenbergMarquardtMinimizer.h"
+#include "Fit/Adapter/GSLMultiMinimizer.h"
+#include "Fit/Adapter/GeneticMinimizer.h"
+#include "Fit/Adapter/Minuit2Minimizer.h"
+#include "Fit/Adapter/SimAnMinimizer.h"
 #include "GUI/coregui/Models/MinimizerItemCatalog.h"
 
 MinimizerItem::MinimizerItem(const QString& model_type) : SessionItem(model_type) {}