diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d6a8467e2823ac349a54dd13472781773ae373b..2e692f49d23546291dc90dd285e3caf8c10cd184 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,20 +176,25 @@ if(BORNAGAIN_PYTHON)
 endif()
 
 # core tests
-add_subdirectory(Tests/UnitTests/Core)
-add_subdirectory(Tests/UnitTests/Numeric)
+add_subdirectory(Tests/Unit/Base)
+add_subdirectory(Tests/Unit/Param)
+add_subdirectory(Tests/Unit/Sample)
+add_subdirectory(Tests/Unit/Device)
+add_subdirectory(Tests/Unit/Resample)
+add_subdirectory(Tests/Unit/Core)
+add_subdirectory(Tests/Unit/Numeric)
 add_subdirectory(Tests/Performance/Core)
 add_subdirectory(Tests/Examples)
 
 # GUI
 if(BORNAGAIN_GUI)
     add_subdirectory(GUI)
-    add_subdirectory(Tests/UnitTests/GUI)
+    add_subdirectory(Tests/Unit/GUI)
     add_subdirectory(Tests/Performance/GUI)
 endif()
 if(BORNAGAIN_NEWREFL)
     add_subdirectory(gui2)
-    add_subdirectory(Tests/UnitTests/gui2)
+    add_subdirectory(Tests/Unit/gui2)
 endif()
 
 # TODO: split Core / GUI
diff --git a/Fit/Test/Unit/CMakeLists.txt b/Fit/Test/Unit/CMakeLists.txt
index 7eb1f74e9143ba391bd69b74903ed71927cd0a97..3b5441e050fab51fd06dfaa2758079e9855b5738 100644
--- a/Fit/Test/Unit/CMakeLists.txt
+++ b/Fit/Test/Unit/CMakeLists.txt
@@ -2,7 +2,7 @@ include(GoogleTest) # provides gtest_discover_tests
 
 set(test UnitTestFit)
 
-include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
+include_directories(${CMAKE_SOURCE_DIR}/Tests/Unit/utilities)
 
 file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
 
diff --git a/Resample/Processed/ProcessedSample.cpp b/Resample/Processed/ProcessedSample.cpp
index 3ef55921a08b1f971b6189bd6372728be71c0187..d6a00136f453afd7eda516334fb0fe203cfd7bc8 100644
--- a/Resample/Processed/ProcessedSample.cpp
+++ b/Resample/Processed/ProcessedSample.cpp
@@ -48,7 +48,7 @@ T averageData(const Material& layer_mat, const Admixtures& admixtures,
     return averaged_data;
 }
 
-// Tested by Tests/UnitTests/Core/Sample/MaterialTest.cpp
+// Tested by Tests/Unit/Core/Sample/MaterialTest.cpp
 
 Material createAveragedMaterial(const Material& layer_mat, const Admixtures& admixtures)
 {
diff --git a/Tests/Functional/Core/CoreSpecial/CMakeLists.txt b/Tests/Functional/Core/CoreSpecial/CMakeLists.txt
index 0806087ce793a58c30aead60cfc5a1ddb337ba53..35e9342d7816ecb9c26bc240ca5b39387e6b1c59 100644
--- a/Tests/Functional/Core/CoreSpecial/CMakeLists.txt
+++ b/Tests/Functional/Core/CoreSpecial/CMakeLists.txt
@@ -10,7 +10,7 @@ set(source_files
 add_executable(${test} ${source_files} ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
 target_include_directories(${test}
     PUBLIC
-    ${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities
+    ${CMAKE_SOURCE_DIR}/Tests/Unit/utilities
     ${CMAKE_SOURCE_DIR}/3rdparty/common/gtest/gtest-1.8.0/include)
 target_link_libraries(${test} ${BornAgainCore_LIBRARY} gtest)
 
diff --git a/Tests/Unit/Base/CMakeLists.txt b/Tests/Unit/Base/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..40848d3509c799abe944f7968e29272efa17b8c6
--- /dev/null
+++ b/Tests/Unit/Base/CMakeLists.txt
@@ -0,0 +1,10 @@
+include(GoogleTest) # provides gtest_discover_tests
+
+set(test UnitTestBase)
+
+file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
+
+add_executable(${test} ${source_files})
+target_link_libraries(${test} ${BornAgainBase_LIBRARY} gtest)
+
+gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Base.Unit.)
diff --git a/Tests/UnitTests/Core/Vector/CVectorTest.cpp b/Tests/Unit/Base/CVectorTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Vector/CVectorTest.cpp
rename to Tests/Unit/Base/CVectorTest.cpp
diff --git a/Tests/UnitTests/Core/Basics/Concat.cpp b/Tests/Unit/Base/Concat.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Basics/Concat.cpp
rename to Tests/Unit/Base/Concat.cpp
diff --git a/Tests/UnitTests/Core/Basics/FileSystemUtilsTest.cpp b/Tests/Unit/Base/FileSystemUtilsTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Basics/FileSystemUtilsTest.cpp
rename to Tests/Unit/Base/FileSystemUtilsTest.cpp
diff --git a/Tests/UnitTests/Core/Vector/KVectorTest.cpp b/Tests/Unit/Base/KVectorTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Vector/KVectorTest.cpp
rename to Tests/Unit/Base/KVectorTest.cpp
diff --git a/Tests/UnitTests/Core/Basics/MinMaxValueTest.cpp b/Tests/Unit/Base/MinMaxValueTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Basics/MinMaxValueTest.cpp
rename to Tests/Unit/Base/MinMaxValueTest.cpp
diff --git a/Tests/UnitTests/Core/Basics/StringUtilsTest.cpp b/Tests/Unit/Base/StringUtilsTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Basics/StringUtilsTest.cpp
rename to Tests/Unit/Base/StringUtilsTest.cpp
diff --git a/Tests/UnitTests/Core/CMakeLists.txt b/Tests/Unit/Core/CMakeLists.txt
similarity index 59%
rename from Tests/UnitTests/Core/CMakeLists.txt
rename to Tests/Unit/Core/CMakeLists.txt
index e2d8e43c2fdba07a6f0d4c6fe3393318400c31f2..257466c463709a765a1075a9085afbd5e3e6492f 100644
--- a/Tests/UnitTests/Core/CMakeLists.txt
+++ b/Tests/Unit/Core/CMakeLists.txt
@@ -2,10 +2,9 @@ include(GoogleTest) # provides gtest_discover_tests
 
 set(test UnitTestCore)
 
-file(GLOB source_files "*/*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
+file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
 
 add_executable(${test} ${source_files})
-target_include_directories(${test} PUBLIC ${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
 target_link_libraries(${test} ${BornAgainCore_LIBRARY} gtest)
 
 gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Core.Unit.)
diff --git a/Tests/UnitTests/Core/Data/ChiSquaredModuleTest.cpp b/Tests/Unit/Core/ChiSquaredModuleTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/ChiSquaredModuleTest.cpp
rename to Tests/Unit/Core/ChiSquaredModuleTest.cpp
diff --git a/Tests/UnitTests/Core/Axes/CoordSystem1DTest.cpp b/Tests/Unit/Core/CoordSystem1DTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Axes/CoordSystem1DTest.cpp
rename to Tests/Unit/Core/CoordSystem1DTest.cpp
diff --git a/Tests/UnitTests/Core/Core/DepthProbeElementTest.cpp b/Tests/Unit/Core/DepthProbeElementTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Core/DepthProbeElementTest.cpp
rename to Tests/Unit/Core/DepthProbeElementTest.cpp
diff --git a/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp b/Tests/Unit/Core/DepthProbeSimulationTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp
rename to Tests/Unit/Core/DepthProbeSimulationTest.cpp
diff --git a/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp b/Tests/Unit/Core/FitObjectiveTest.cpp
similarity index 96%
rename from Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
rename to Tests/Unit/Core/FitObjectiveTest.cpp
index 37f89ab980d9af5d17d6d797d663996721186bae..a688e311f55ed848f5efca31e641ba42221c9485 100644
--- a/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
+++ b/Tests/Unit/Core/FitObjectiveTest.cpp
@@ -1,6 +1,6 @@
 #include "Core/Fitting/FitObjective.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
+#include "Tests/Unit/FittingTestHelper.h"
 
 class FitObjectiveTest : public ::testing::Test {
 };
diff --git a/Tests/UnitTests/Core/Fitting/FitObserverTest.cpp b/Tests/Unit/Core/FitObserverTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Fitting/FitObserverTest.cpp
rename to Tests/Unit/Core/FitObserverTest.cpp
diff --git a/Tests/UnitTests/Core/Core/GISASSimulationTest.cpp b/Tests/Unit/Core/GISASSimulationTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Core/GISASSimulationTest.cpp
rename to Tests/Unit/Core/GISASSimulationTest.cpp
diff --git a/Tests/UnitTests/Core/Fitting/ObjectiveMetricTest.cpp b/Tests/Unit/Core/ObjectiveMetricTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Fitting/ObjectiveMetricTest.cpp
rename to Tests/Unit/Core/ObjectiveMetricTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp b/Tests/Unit/Core/ParticleLayoutTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp
rename to Tests/Unit/Core/ParticleLayoutTest.cpp
diff --git a/Tests/UnitTests/Core/Core/PythonFormattingTest.cpp b/Tests/Unit/Core/PythonFormattingTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Core/PythonFormattingTest.cpp
rename to Tests/Unit/Core/PythonFormattingTest.cpp
diff --git a/Tests/UnitTests/Core/Instrument/RectangularDetectorTest.cpp b/Tests/Unit/Core/RectangularDetectorTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Instrument/RectangularDetectorTest.cpp
rename to Tests/Unit/Core/RectangularDetectorTest.cpp
diff --git a/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp b/Tests/Unit/Core/SimDataPairTest.cpp
similarity index 98%
rename from Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
rename to Tests/Unit/Core/SimDataPairTest.cpp
index 4f6c1602b8620a59e8df91379c54fb4405c1d3cf..4b61c95c1421447ca5824b8727631fa60449c501 100644
--- a/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
+++ b/Tests/Unit/Core/SimDataPairTest.cpp
@@ -1,6 +1,6 @@
 #include "Core/Fitting/SimDataPair.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
+#include "Tests/Unit/FittingTestHelper.h"
 
 class SimDataPairTest : public ::testing::Test {
 };
diff --git a/Tests/UnitTests/Core/Core/SimulationResultTest.cpp b/Tests/Unit/Core/SimulationResultTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Core/SimulationResultTest.cpp
rename to Tests/Unit/Core/SimulationResultTest.cpp
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp b/Tests/Unit/Core/SpecularScanTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
rename to Tests/Unit/Core/SpecularScanTest.cpp
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp b/Tests/Unit/Core/SpecularSimulationTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
rename to Tests/Unit/Core/SpecularSimulationTest.cpp
diff --git a/Tests/UnitTests/Core/Data/ArrayUtilsTest.cpp b/Tests/Unit/Device/ArrayUtilsTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/ArrayUtilsTest.cpp
rename to Tests/Unit/Device/ArrayUtilsTest.cpp
diff --git a/Tests/UnitTests/Core/Instrument/BeamFootprintTest.cpp b/Tests/Unit/Device/BeamFootprintTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Instrument/BeamFootprintTest.cpp
rename to Tests/Unit/Device/BeamFootprintTest.cpp
diff --git a/Tests/UnitTests/Core/Instrument/BeamTest.cpp b/Tests/Unit/Device/BeamTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Instrument/BeamTest.cpp
rename to Tests/Unit/Device/BeamTest.cpp
diff --git a/Tests/Unit/Device/CMakeLists.txt b/Tests/Unit/Device/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..940658efdaeae90534fc6b2dba60d2508665f125
--- /dev/null
+++ b/Tests/Unit/Device/CMakeLists.txt
@@ -0,0 +1,10 @@
+include(GoogleTest) # provides gtest_discover_tests
+
+set(test UnitTestDevice)
+
+file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
+
+add_executable(${test} ${source_files})
+target_link_libraries(${test} ${BornAgainDevice_LIBRARY} gtest)
+
+gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Device.Unit.)
diff --git a/Tests/UnitTests/Core/Axes/ConstKBinAxisTest.cpp b/Tests/Unit/Device/ConstKBinAxisTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Axes/ConstKBinAxisTest.cpp
rename to Tests/Unit/Device/ConstKBinAxisTest.cpp
diff --git a/Tests/UnitTests/Core/Data/CumulativeValueTest.cpp b/Tests/Unit/Device/CumulativeValueTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/CumulativeValueTest.cpp
rename to Tests/Unit/Device/CumulativeValueTest.cpp
diff --git a/Tests/UnitTests/Core/Axes/CustomBinAxisTest.cpp b/Tests/Unit/Device/CustomBinAxisTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Axes/CustomBinAxisTest.cpp
rename to Tests/Unit/Device/CustomBinAxisTest.cpp
diff --git a/Tests/UnitTests/Core/Core/DepthProbeConverterTest.cpp b/Tests/Unit/Device/DepthProbeConverterTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Core/DepthProbeConverterTest.cpp
rename to Tests/Unit/Device/DepthProbeConverterTest.cpp
diff --git a/Tests/UnitTests/Core/Mask/DetectorMaskTest.cpp b/Tests/Unit/Device/DetectorMaskTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Mask/DetectorMaskTest.cpp
rename to Tests/Unit/Device/DetectorMaskTest.cpp
diff --git a/Tests/UnitTests/Core/Axes/FixedBinAxisTest.cpp b/Tests/Unit/Device/FixedBinAxisTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Axes/FixedBinAxisTest.cpp
rename to Tests/Unit/Device/FixedBinAxisTest.cpp
diff --git a/Tests/UnitTests/Core/Data/Histogram1DTest.cpp b/Tests/Unit/Device/Histogram1DTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/Histogram1DTest.cpp
rename to Tests/Unit/Device/Histogram1DTest.cpp
diff --git a/Tests/UnitTests/Core/Data/Histogram2DTest.cpp b/Tests/Unit/Device/Histogram2DTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/Histogram2DTest.cpp
rename to Tests/Unit/Device/Histogram2DTest.cpp
diff --git a/Tests/UnitTests/Core/Data/IOReaderWriterTest.cpp b/Tests/Unit/Device/IOReaderWriterTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/IOReaderWriterTest.cpp
rename to Tests/Unit/Device/IOReaderWriterTest.cpp
diff --git a/Tests/UnitTests/Core/Data/IntensityDataFunctionsTest.cpp b/Tests/Unit/Device/IntensityDataFunctionsTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/IntensityDataFunctionsTest.cpp
rename to Tests/Unit/Device/IntensityDataFunctionsTest.cpp
diff --git a/Tests/UnitTests/Core/Data/LLDataTest.cpp b/Tests/Unit/Device/LLDataTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/LLDataTest.cpp
rename to Tests/Unit/Device/LLDataTest.cpp
diff --git a/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp b/Tests/Unit/Device/OffSpecularConverterTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp
rename to Tests/Unit/Device/OffSpecularConverterTest.cpp
diff --git a/Tests/UnitTests/Core/Data/OutputDataIteratorTest.cpp b/Tests/Unit/Device/OutputDataIteratorTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/OutputDataIteratorTest.cpp
rename to Tests/Unit/Device/OutputDataIteratorTest.cpp
diff --git a/Tests/UnitTests/Core/Data/OutputDataTest.cpp b/Tests/Unit/Device/OutputDataTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/OutputDataTest.cpp
rename to Tests/Unit/Device/OutputDataTest.cpp
diff --git a/Tests/UnitTests/Core/Axes/PointwiseAxisTest.cpp b/Tests/Unit/Device/PointwiseAxisTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Axes/PointwiseAxisTest.cpp
rename to Tests/Unit/Device/PointwiseAxisTest.cpp
diff --git a/Tests/UnitTests/Core/Mask/PolygonTest.cpp b/Tests/Unit/Device/PolygonTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Mask/PolygonTest.cpp
rename to Tests/Unit/Device/PolygonTest.cpp
diff --git a/Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp b/Tests/Unit/Device/RectangularConverterTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp
rename to Tests/Unit/Device/RectangularConverterTest.cpp
diff --git a/Tests/UnitTests/Core/Mask/RegionOfInterestTest.cpp b/Tests/Unit/Device/RegionOfInterestTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Mask/RegionOfInterestTest.cpp
rename to Tests/Unit/Device/RegionOfInterestTest.cpp
diff --git a/Tests/UnitTests/Core/Parameters/ScanResolutionTest.cpp b/Tests/Unit/Device/ScanResolutionTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Parameters/ScanResolutionTest.cpp
rename to Tests/Unit/Device/ScanResolutionTest.cpp
diff --git a/Tests/UnitTests/Core/Mask/Shape2DTest.cpp b/Tests/Unit/Device/Shape2DTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Mask/Shape2DTest.cpp
rename to Tests/Unit/Device/Shape2DTest.cpp
diff --git a/Tests/UnitTests/Core/Instrument/SimulationAreaTest.cpp b/Tests/Unit/Device/SimulationAreaTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Instrument/SimulationAreaTest.cpp
rename to Tests/Unit/Device/SimulationAreaTest.cpp
diff --git a/Tests/UnitTests/Core/Data/SpectrumTest.cpp b/Tests/Unit/Device/SpectrumTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Data/SpectrumTest.cpp
rename to Tests/Unit/Device/SpectrumTest.cpp
diff --git a/Tests/UnitTests/Core/Instrument/SpecularDetector1DTest.cpp b/Tests/Unit/Device/SpecularDetector1DTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Instrument/SpecularDetector1DTest.cpp
rename to Tests/Unit/Device/SpecularDetector1DTest.cpp
diff --git a/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp b/Tests/Unit/Device/SphericalConverterTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp
rename to Tests/Unit/Device/SphericalConverterTest.cpp
diff --git a/Tests/UnitTests/Core/Instrument/SphericalDetectorTest.cpp b/Tests/Unit/Device/SphericalDetectorTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Instrument/SphericalDetectorTest.cpp
rename to Tests/Unit/Device/SphericalDetectorTest.cpp
diff --git a/Tests/UnitTests/Core/Axes/VariableBinAxisTest.cpp b/Tests/Unit/Device/VariableBinAxisTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Axes/VariableBinAxisTest.cpp
rename to Tests/Unit/Device/VariableBinAxisTest.cpp
diff --git a/Tests/UnitTests/Core/Fitting/FittingTestHelper.h b/Tests/Unit/FittingTestHelper.h
similarity index 100%
rename from Tests/UnitTests/Core/Fitting/FittingTestHelper.h
rename to Tests/Unit/FittingTestHelper.h
diff --git a/Tests/UnitTests/GUI/CMakeLists.txt b/Tests/Unit/GUI/CMakeLists.txt
similarity index 85%
rename from Tests/UnitTests/GUI/CMakeLists.txt
rename to Tests/Unit/GUI/CMakeLists.txt
index b9f9184de0f697e4c7e56c9506765524e8a24c38..4449fe60a921260d3f699a9fdd9d2e9f42e52e1a 100644
--- a/Tests/UnitTests/GUI/CMakeLists.txt
+++ b/Tests/Unit/GUI/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB source_files *.cpp)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Test REQUIRED)
 
-include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
+include_directories(${CMAKE_SOURCE_DIR}/Tests/Unit/utilities)
 
 set(CMAKE_AUTOMOC ON)
 add_executable(${test} ${source_files})
diff --git a/Tests/UnitTests/GUI/Comparators.cpp b/Tests/Unit/GUI/Comparators.cpp
similarity index 89%
rename from Tests/UnitTests/GUI/Comparators.cpp
rename to Tests/Unit/GUI/Comparators.cpp
index 78efeac2b04c86e69b2745b8a87e6b492308e1ad..9fdd1c51f68f9c6c632576568d49b44d63ce8b89 100644
--- a/Tests/UnitTests/GUI/Comparators.cpp
+++ b/Tests/Unit/GUI/Comparators.cpp
@@ -1,4 +1,4 @@
-#include "Tests/UnitTests/GUI/Comparators.h"
+#include "Tests/Unit/GUI/Comparators.h"
 #include "GUI/Models/ComboProperty.h"
 #include "GUI/Models/ExternalProperty.h"
 #include <QMetaType>
diff --git a/Tests/UnitTests/GUI/Comparators.h b/Tests/Unit/GUI/Comparators.h
similarity index 100%
rename from Tests/UnitTests/GUI/Comparators.h
rename to Tests/Unit/GUI/Comparators.h
diff --git a/Tests/UnitTests/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestAxesItems.cpp
rename to Tests/Unit/GUI/TestAxesItems.cpp
diff --git a/Tests/UnitTests/GUI/TestComboProperty.cpp b/Tests/Unit/GUI/TestComboProperty.cpp
similarity index 99%
rename from Tests/UnitTests/GUI/TestComboProperty.cpp
rename to Tests/Unit/GUI/TestComboProperty.cpp
index 96ec6b2fb0c443762268c6bced0d841c86275b58..f6ed04556dceff8c13ba91cb8ed5b782b7c92b09 100644
--- a/Tests/UnitTests/GUI/TestComboProperty.cpp
+++ b/Tests/Unit/GUI/TestComboProperty.cpp
@@ -1,7 +1,7 @@
 #include "GUI/Models/ComboProperty.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Comparators.h"
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Comparators.h"
+#include "Tests/Unit/GUI/Utils.h"
 
 class TestComboProperty : public ::testing::Test {
 public:
diff --git a/Tests/UnitTests/GUI/TestComponentProxyModel.cpp b/Tests/Unit/GUI/TestComponentProxyModel.cpp
similarity index 99%
rename from Tests/UnitTests/GUI/TestComponentProxyModel.cpp
rename to Tests/Unit/GUI/TestComponentProxyModel.cpp
index c43dce308818ad65c898ef70d412da04ded6b53c..9f211e2486f8fac81740ac757efeae4262958a05 100644
--- a/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
+++ b/Tests/Unit/GUI/TestComponentProxyModel.cpp
@@ -11,7 +11,7 @@
 #include "GUI/Models/SessionModel.h"
 #include "GUI/Models/VectorItem.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Utils.h"
 #include <QDebug>
 #include <QSignalSpy>
 
diff --git a/Tests/UnitTests/GUI/TestComponentUtils.cpp b/Tests/Unit/GUI/TestComponentUtils.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestComponentUtils.cpp
rename to Tests/Unit/GUI/TestComponentUtils.cpp
diff --git a/Tests/UnitTests/GUI/TestCsvImportData.cpp b/Tests/Unit/GUI/TestCsvImportData.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestCsvImportData.cpp
rename to Tests/Unit/GUI/TestCsvImportData.cpp
diff --git a/Tests/UnitTests/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
similarity index 99%
rename from Tests/UnitTests/GUI/TestDataItemViews.cpp
rename to Tests/Unit/GUI/TestDataItemViews.cpp
index 71b1ee65a83b7968e24f5448ceb3da19926dd6b4..5bae879130809b01890043b555a8d1e112841931 100644
--- a/Tests/UnitTests/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -9,7 +9,7 @@
 #include "GUI/mainwindow/projectdocument.h"
 #include "GUI/utils/MessageService.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Utils.h"
 
 class TestDataItemViews : public ::testing::Test {
 public:
diff --git a/Tests/UnitTests/GUI/TestDataItems.cpp b/Tests/Unit/GUI/TestDataItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestDataItems.cpp
rename to Tests/Unit/GUI/TestDataItems.cpp
diff --git a/Tests/UnitTests/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestDetectorItems.cpp
rename to Tests/Unit/GUI/TestDetectorItems.cpp
diff --git a/Tests/UnitTests/GUI/TestExternalProperty.cpp b/Tests/Unit/GUI/TestExternalProperty.cpp
similarity index 97%
rename from Tests/UnitTests/GUI/TestExternalProperty.cpp
rename to Tests/Unit/GUI/TestExternalProperty.cpp
index 6a62c73398e310e6cd7a387e5714778f6ab3c787..c0eb647ed9e3f3f0dc00dfdb5b5e5b0e203a628f 100644
--- a/Tests/UnitTests/GUI/TestExternalProperty.cpp
+++ b/Tests/Unit/GUI/TestExternalProperty.cpp
@@ -1,7 +1,7 @@
 #include "GUI/Models/ExternalProperty.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Comparators.h"
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Comparators.h"
+#include "Tests/Unit/GUI/Utils.h"
 
 class TestExternalProperty : public ::testing::Test {
 public:
diff --git a/Tests/UnitTests/GUI/TestFTDistributionItems.cpp b/Tests/Unit/GUI/TestFTDistributionItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestFTDistributionItems.cpp
rename to Tests/Unit/GUI/TestFTDistributionItems.cpp
diff --git a/Tests/UnitTests/GUI/TestFitParameterModel.cpp b/Tests/Unit/GUI/TestFitParameterModel.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestFitParameterModel.cpp
rename to Tests/Unit/GUI/TestFitParameterModel.cpp
diff --git a/Tests/UnitTests/GUI/TestFormFactorItems.cpp b/Tests/Unit/GUI/TestFormFactorItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestFormFactorItems.cpp
rename to Tests/Unit/GUI/TestFormFactorItems.cpp
diff --git a/Tests/UnitTests/GUI/TestGUI.cpp b/Tests/Unit/GUI/TestGUI.cpp
similarity index 91%
rename from Tests/UnitTests/GUI/TestGUI.cpp
rename to Tests/Unit/GUI/TestGUI.cpp
index 758ffbef2a4314feab2b711150b0adbccf73e7c3..ea4c58536d19e83d6ccca59784fc34afec696083 100644
--- a/Tests/UnitTests/GUI/TestGUI.cpp
+++ b/Tests/Unit/GUI/TestGUI.cpp
@@ -1,5 +1,5 @@
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Comparators.h"
+#include "Tests/Unit/GUI/Comparators.h"
 #include <QAbstractItemModel>
 #include <QCoreApplication>
 
diff --git a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp b/Tests/Unit/GUI/TestGUICoreObjectCorrespondence.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
rename to Tests/Unit/GUI/TestGUICoreObjectCorrespondence.cpp
diff --git a/Tests/UnitTests/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
similarity index 99%
rename from Tests/UnitTests/GUI/TestGroupItem.cpp
rename to Tests/Unit/GUI/TestGroupItem.cpp
index 2245910f3f36ef8efe9060f2a255e300255aa55f..a7a80d6977f5fba6f54494b015b5dde12e441a04 100644
--- a/Tests/UnitTests/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -5,7 +5,7 @@
 #include "GUI/Models/SessionItemUtils.h"
 #include "GUI/Models/SessionModel.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Utils.h"
 
 class TestGroupItem : public ::testing::Test {
 };
diff --git a/Tests/UnitTests/GUI/TestHelpers.cpp b/Tests/Unit/GUI/TestHelpers.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestHelpers.cpp
rename to Tests/Unit/GUI/TestHelpers.cpp
diff --git a/Tests/UnitTests/GUI/TestInstrumentModel.cpp b/Tests/Unit/GUI/TestInstrumentModel.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestInstrumentModel.cpp
rename to Tests/Unit/GUI/TestInstrumentModel.cpp
diff --git a/Tests/UnitTests/GUI/TestLayerItems.cpp b/Tests/Unit/GUI/TestLayerItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestLayerItems.cpp
rename to Tests/Unit/GUI/TestLayerItems.cpp
diff --git a/Tests/UnitTests/GUI/TestLayerRoughnessItems.cpp b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestLayerRoughnessItems.cpp
rename to Tests/Unit/GUI/TestLayerRoughnessItems.cpp
diff --git a/Tests/UnitTests/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
similarity index 98%
rename from Tests/UnitTests/GUI/TestLinkInstrument.cpp
rename to Tests/Unit/GUI/TestLinkInstrument.cpp
index 939d2c806afc517bf444caef955b4ef289864c3d..0ff6bfa2e247625d967cf6ffd556f0abbb500183 100644
--- a/Tests/UnitTests/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -8,7 +8,7 @@
 #include "GUI/Models/RectangularDetectorItem.h"
 #include "GUI/Views/ImportDataWidgets/LinkInstrumentManager.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Utils.h"
 #include <QSignalSpy>
 #include <QTest>
 
diff --git a/Tests/UnitTests/GUI/TestMapperCases.cpp b/Tests/Unit/GUI/TestMapperCases.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMapperCases.cpp
rename to Tests/Unit/GUI/TestMapperCases.cpp
diff --git a/Tests/UnitTests/GUI/TestMapperForItem.cpp b/Tests/Unit/GUI/TestMapperForItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMapperForItem.cpp
rename to Tests/Unit/GUI/TestMapperForItem.cpp
diff --git a/Tests/UnitTests/GUI/TestMaterialModel.cpp b/Tests/Unit/GUI/TestMaterialModel.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMaterialModel.cpp
rename to Tests/Unit/GUI/TestMaterialModel.cpp
diff --git a/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp b/Tests/Unit/GUI/TestMaterialPropertyController.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
rename to Tests/Unit/GUI/TestMaterialPropertyController.cpp
diff --git a/Tests/UnitTests/GUI/TestMessageService.cpp b/Tests/Unit/GUI/TestMessageService.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMessageService.cpp
rename to Tests/Unit/GUI/TestMessageService.cpp
diff --git a/Tests/UnitTests/GUI/TestModelUtils.cpp b/Tests/Unit/GUI/TestModelUtils.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestModelUtils.cpp
rename to Tests/Unit/GUI/TestModelUtils.cpp
diff --git a/Tests/UnitTests/GUI/TestMultiLayerItem.cpp b/Tests/Unit/GUI/TestMultiLayerItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMultiLayerItem.cpp
rename to Tests/Unit/GUI/TestMultiLayerItem.cpp
diff --git a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
similarity index 99%
rename from Tests/UnitTests/GUI/TestOutputDataIOService.cpp
rename to Tests/Unit/GUI/TestOutputDataIOService.cpp
index e405b6bf6b9ae892b77d1611265a63e77df37a56..569053be56242ad85127db36e2a5a859175bca9d 100644
--- a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -14,7 +14,7 @@
 #include "GUI/mainwindow/ProjectUtils.h"
 #include "GUI/utils/Helpers.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Utils.h"
 #include <QTest>
 #include <memory>
 
diff --git a/Tests/UnitTests/GUI/TestParaCrystalItems.cpp b/Tests/Unit/GUI/TestParaCrystalItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestParaCrystalItems.cpp
rename to Tests/Unit/GUI/TestParaCrystalItems.cpp
diff --git a/Tests/UnitTests/GUI/TestParticleCoreShell.cpp b/Tests/Unit/GUI/TestParticleCoreShell.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestParticleCoreShell.cpp
rename to Tests/Unit/GUI/TestParticleCoreShell.cpp
diff --git a/Tests/UnitTests/GUI/TestParticleItem.cpp b/Tests/Unit/GUI/TestParticleItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestParticleItem.cpp
rename to Tests/Unit/GUI/TestParticleItem.cpp
diff --git a/Tests/UnitTests/GUI/TestParticleLayoutItem.h b/Tests/Unit/GUI/TestParticleLayoutItem.h
similarity index 99%
rename from Tests/UnitTests/GUI/TestParticleLayoutItem.h
rename to Tests/Unit/GUI/TestParticleLayoutItem.h
index 199f92525171d1a0cc8eb86bdcba1b25f46fc6cb..46dd964effe536ee3a99381bc0c5d3281846b0bd 100644
--- a/Tests/UnitTests/GUI/TestParticleLayoutItem.h
+++ b/Tests/Unit/GUI/TestParticleLayoutItem.h
@@ -7,7 +7,7 @@
 #include "GUI/Models/ParticleLayoutItem.h"
 #include "GUI/Models/SampleModel.h"
 #include "GUI/Models/SessionItemUtils.h"
-#include "Tests/UnitTests/utilities/google_test.h"
+#include "Tests/Unit/utilities/google_test.h"
 
 class TestParticleLayoutItem : public ::testing::Test {
 };
diff --git a/Tests/UnitTests/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
similarity index 99%
rename from Tests/UnitTests/GUI/TestProjectDocument.cpp
rename to Tests/Unit/GUI/TestProjectDocument.cpp
index ef3c33aa351f4bbd594d7c7d59bf4c657a3e658a..2b23efa451dd50ac60faf18fce7d6fd4d08b7a43 100644
--- a/Tests/UnitTests/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -9,7 +9,7 @@
 #include "GUI/mainwindow/projectdocument.h"
 #include "GUI/utils/Helpers.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Utils.h"
 #include <QFileInfo>
 #include <QSignalSpy>
 
diff --git a/Tests/UnitTests/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestProjectUtils.cpp
rename to Tests/Unit/GUI/TestProjectUtils.cpp
diff --git a/Tests/UnitTests/GUI/TestPropertyRepeater.cpp b/Tests/Unit/GUI/TestPropertyRepeater.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestPropertyRepeater.cpp
rename to Tests/Unit/GUI/TestPropertyRepeater.cpp
diff --git a/Tests/UnitTests/GUI/TestProxyModelStrategy.cpp b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestProxyModelStrategy.cpp
rename to Tests/Unit/GUI/TestProxyModelStrategy.cpp
diff --git a/Tests/UnitTests/GUI/TestRealDataModel.cpp b/Tests/Unit/GUI/TestRealDataModel.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestRealDataModel.cpp
rename to Tests/Unit/GUI/TestRealDataModel.cpp
diff --git a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
rename to Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
diff --git a/Tests/UnitTests/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
similarity index 99%
rename from Tests/UnitTests/GUI/TestSaveService.cpp
rename to Tests/Unit/GUI/TestSaveService.cpp
index fc476d69f5396f7868017d4f05cf4c034048c7c7..d7e514c2c9244bbb23385a05ff670f4f86161e09 100644
--- a/Tests/UnitTests/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -12,7 +12,7 @@
 #include "GUI/mainwindow/projectdocument.h"
 #include "GUI/utils/Helpers.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Utils.h"
 #include <QSignalSpy>
 
 class TestSaveService : public ::testing::Test {
diff --git a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
similarity index 99%
rename from Tests/UnitTests/GUI/TestSavingSpecularData.cpp
rename to Tests/Unit/GUI/TestSavingSpecularData.cpp
index 143083dfe09bd97efc07efbce313116e0092abf8..c42902d603b92e1fcba99b14bec8d93d2200043a 100644
--- a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -16,7 +16,7 @@
 #include "GUI/mainwindow/OutputDataIOService.h"
 #include "GUI/mainwindow/ProjectUtils.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Utils.h"
 #include <QTest>
 
 class TestSavingSpecularData : public ::testing::Test {
diff --git a/Tests/UnitTests/GUI/TestScientificSpinBox.cpp b/Tests/Unit/GUI/TestScientificSpinBox.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestScientificSpinBox.cpp
rename to Tests/Unit/GUI/TestScientificSpinBox.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionItem.cpp b/Tests/Unit/GUI/TestSessionItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionItem.cpp
rename to Tests/Unit/GUI/TestSessionItem.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionItemController.cpp b/Tests/Unit/GUI/TestSessionItemController.cpp
similarity index 99%
rename from Tests/UnitTests/GUI/TestSessionItemController.cpp
rename to Tests/Unit/GUI/TestSessionItemController.cpp
index 4a14f3c78cc6397cc0d52e0e6a47446dee02ec29..04ea3baa1c767e4bd3107725d213e8921fbbd27a 100644
--- a/Tests/UnitTests/GUI/TestSessionItemController.cpp
+++ b/Tests/Unit/GUI/TestSessionItemController.cpp
@@ -2,7 +2,7 @@
 #include "GUI/Models/SessionModel.h"
 #include "GUI/Views/CommonWidgets/SessionItemController.h"
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/GUI/TestSessionItemControllerHelper.h"
+#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
 #include <QObject>
 
 class TestSessionItemController : public ::testing::Test {
diff --git a/Tests/UnitTests/GUI/TestSessionItemControllerHelper.cpp b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
similarity index 95%
rename from Tests/UnitTests/GUI/TestSessionItemControllerHelper.cpp
rename to Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
index f80e82ccc4ece0a0be03543bee0ae85b2c950287..02673e5d27b705441af8084cb60a029c727236eb 100644
--- a/Tests/UnitTests/GUI/TestSessionItemControllerHelper.cpp
+++ b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
@@ -1,4 +1,4 @@
-#include "Tests/UnitTests/GUI/TestSessionItemControllerHelper.h"
+#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
 #include "GUI/Models/SessionItem.h"
 #include "GUI/Views/CommonWidgets/SessionItemController.h"
 
diff --git a/Tests/UnitTests/GUI/TestSessionItemControllerHelper.h b/Tests/Unit/GUI/TestSessionItemControllerHelper.h
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionItemControllerHelper.h
rename to Tests/Unit/GUI/TestSessionItemControllerHelper.h
diff --git a/Tests/UnitTests/GUI/TestSessionItemData.cpp b/Tests/Unit/GUI/TestSessionItemData.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionItemData.cpp
rename to Tests/Unit/GUI/TestSessionItemData.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionItemTags.cpp b/Tests/Unit/GUI/TestSessionItemTags.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionItemTags.cpp
rename to Tests/Unit/GUI/TestSessionItemTags.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionItemUtils.cpp
rename to Tests/Unit/GUI/TestSessionItemUtils.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionModel.cpp
rename to Tests/Unit/GUI/TestSessionModel.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionXML.cpp
rename to Tests/Unit/GUI/TestSessionXML.cpp
diff --git a/Tests/UnitTests/GUI/TestUpdateTimer.cpp b/Tests/Unit/GUI/TestUpdateTimer.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestUpdateTimer.cpp
rename to Tests/Unit/GUI/TestUpdateTimer.cpp
diff --git a/Tests/UnitTests/GUI/TestVectorItem.cpp b/Tests/Unit/GUI/TestVectorItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestVectorItem.cpp
rename to Tests/Unit/GUI/TestVectorItem.cpp
diff --git a/Tests/UnitTests/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
similarity index 96%
rename from Tests/UnitTests/GUI/Utils.cpp
rename to Tests/Unit/GUI/Utils.cpp
index eb1f4273fe3fdade2e0f3e48ee881b522b0dbc77..4b97d4c37967bbbbae8bcdab2ddb0ac7ea7dd4ed 100644
--- a/Tests/UnitTests/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/UnitTests/GUI/Utils.cpp
+//! @file      Tests/Unit/GUI/Utils.cpp
 //! @brief     Implements auxiliary test functions in a namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -13,7 +13,7 @@
 //
 //  ************************************************************************************************
 
-#include "Tests/UnitTests/GUI/Utils.h"
+#include "Tests/Unit/GUI/Utils.h"
 #include "Device/Data/DataUtils.h"
 #include "Device/Histo/IntensityDataIOFactory.h"
 #include "GUI/Models/Error.h"
diff --git a/Tests/UnitTests/GUI/Utils.h b/Tests/Unit/GUI/Utils.h
similarity index 98%
rename from Tests/UnitTests/GUI/Utils.h
rename to Tests/Unit/GUI/Utils.h
index b631c31c89cebac73624b2b9873612619dabf1aa..350b9b1f6b3e164787d480f7f8570143959a7744 100644
--- a/Tests/UnitTests/GUI/Utils.h
+++ b/Tests/Unit/GUI/Utils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Tests/UnitTests/GUI/Utils.h
+//! @file      Tests/Unit/GUI/Utils.h
 //! @brief     Defines auxiliary test functions in a namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/UnitTests/Numeric/BesselTest.cpp b/Tests/Unit/Numeric/BesselTest.cpp
similarity index 100%
rename from Tests/UnitTests/Numeric/BesselTest.cpp
rename to Tests/Unit/Numeric/BesselTest.cpp
diff --git a/Tests/UnitTests/Numeric/BisectFF.cpp b/Tests/Unit/Numeric/BisectFF.cpp
similarity index 100%
rename from Tests/UnitTests/Numeric/BisectFF.cpp
rename to Tests/Unit/Numeric/BisectFF.cpp
diff --git a/Tests/UnitTests/Numeric/CMakeLists.txt b/Tests/Unit/Numeric/CMakeLists.txt
similarity index 93%
rename from Tests/UnitTests/Numeric/CMakeLists.txt
rename to Tests/Unit/Numeric/CMakeLists.txt
index be21eb71bba432beff0515418eab4b96cf3af377..a192ce406bd85811d29a25247a13fc37218424c9 100644
--- a/Tests/UnitTests/Numeric/CMakeLists.txt
+++ b/Tests/Unit/Numeric/CMakeLists.txt
@@ -11,7 +11,7 @@ file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cp
 add_executable(${test} ${source_files})
 target_include_directories(${test} PUBLIC
     ${CMAKE_SOURCE_DIR}/3rdparty/common/gtest/gtest-1.8.0/include
-    ${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
+    ${CMAKE_SOURCE_DIR}/Tests/Unit/utilities)
 target_link_libraries(${test} ${BornAgainCore_LIBRARY} gtest)
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     target_compile_options(${test} PUBLIC "-Wno-deprecated-copy")
diff --git a/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp b/Tests/Unit/Numeric/FormFactorSpecializationTest.cpp
similarity index 98%
rename from Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp
rename to Tests/Unit/Numeric/FormFactorSpecializationTest.cpp
index 91e1c8d5a74a87c10116add022f28423290d0d0d..6dd767799a30e50b8933b4d05b3bc4309c51a5d2 100644
--- a/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp
+++ b/Tests/Unit/Numeric/FormFactorSpecializationTest.cpp
@@ -1,7 +1,7 @@
 #include "Sample/HardParticle/HardParticles.h"
 #include "Sample/HardParticle/PolyhedralComponents.h" // for diagnostic
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/Numeric/MultiQTestbed.h"
+#include "Tests/Unit/Numeric/MultiQTestbed.h"
 
 //! Compare form factor for particle shapes A and B, where A is given special
 //! parameter values so that it coincides with the more symmetric B.
diff --git a/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp b/Tests/Unit/Numeric/FormFactorSymmetryTest.cpp
similarity index 98%
rename from Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp
rename to Tests/Unit/Numeric/FormFactorSymmetryTest.cpp
index 77e543f16e8a7c9c7a77815a6e4ae945fc0503c6..000fb895bf6e440d0db5bde5423e4abe07f2ce67 100644
--- a/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp
+++ b/Tests/Unit/Numeric/FormFactorSymmetryTest.cpp
@@ -2,7 +2,7 @@
 #include "Sample/HardParticle/HardParticles.h"
 #include "Sample/HardParticle/PolyhedralComponents.h" // for diagnostic
 #include "Tests/GTestWrapper/google_test.h"
-#include "Tests/UnitTests/Numeric/MultiQTestbed.h"
+#include "Tests/Unit/Numeric/MultiQTestbed.h"
 
 //! Check that form factors are invariant when q is transformed according to particle symmetry.
 
diff --git a/Tests/UnitTests/Numeric/FourierTransformTest.cpp b/Tests/Unit/Numeric/FourierTransformTest.cpp
similarity index 100%
rename from Tests/UnitTests/Numeric/FourierTransformTest.cpp
rename to Tests/Unit/Numeric/FourierTransformTest.cpp
diff --git a/Tests/UnitTests/Numeric/MultiQTestbed.cpp b/Tests/Unit/Numeric/MultiQTestbed.cpp
similarity index 97%
rename from Tests/UnitTests/Numeric/MultiQTestbed.cpp
rename to Tests/Unit/Numeric/MultiQTestbed.cpp
index fa4467dbf23b94152e73ed6e4d6f793d435a7ed6..098ad2db312ca8c6eab3d233665f70db5efdf708 100644
--- a/Tests/UnitTests/Numeric/MultiQTestbed.cpp
+++ b/Tests/Unit/Numeric/MultiQTestbed.cpp
@@ -1,4 +1,4 @@
-#include "Tests/UnitTests/Numeric/MultiQTestbed.h"
+#include "Tests/Unit/Numeric/MultiQTestbed.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 using ::testing::Combine;
diff --git a/Tests/UnitTests/Numeric/MultiQTestbed.h b/Tests/Unit/Numeric/MultiQTestbed.h
similarity index 100%
rename from Tests/UnitTests/Numeric/MultiQTestbed.h
rename to Tests/Unit/Numeric/MultiQTestbed.h
diff --git a/Tests/UnitTests/Numeric/SpecialFunctionsTest.cpp b/Tests/Unit/Numeric/SpecialFunctionsTest.cpp
similarity index 100%
rename from Tests/UnitTests/Numeric/SpecialFunctionsTest.cpp
rename to Tests/Unit/Numeric/SpecialFunctionsTest.cpp
diff --git a/Tests/Unit/Param/CMakeLists.txt b/Tests/Unit/Param/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7f5af30211c2037536d21cd5983bcfc310845a2c
--- /dev/null
+++ b/Tests/Unit/Param/CMakeLists.txt
@@ -0,0 +1,10 @@
+include(GoogleTest) # provides gtest_discover_tests
+
+set(test UnitTestParam)
+
+file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
+
+add_executable(${test} ${source_files})
+target_link_libraries(${test} ${BornAgainParam_LIBRARY} gtest)
+
+gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Param.Unit.)
diff --git a/Tests/UnitTests/Core/Parameters/DistributionHandlerTest.cpp b/Tests/Unit/Param/DistributionHandlerTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Parameters/DistributionHandlerTest.cpp
rename to Tests/Unit/Param/DistributionHandlerTest.cpp
diff --git a/Tests/UnitTests/Core/Parameters/DistributionsTest.cpp b/Tests/Unit/Param/DistributionsTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Parameters/DistributionsTest.cpp
rename to Tests/Unit/Param/DistributionsTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/INodeTest.cpp b/Tests/Unit/Param/INodeTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/INodeTest.cpp
rename to Tests/Unit/Param/INodeTest.cpp
diff --git a/Tests/UnitTests/Core/Parameters/IParameterizedTest.cpp b/Tests/Unit/Param/IParameterizedTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Parameters/IParameterizedTest.cpp
rename to Tests/Unit/Param/IParameterizedTest.cpp
diff --git a/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp b/Tests/Unit/Param/ParameterDistributionTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp
rename to Tests/Unit/Param/ParameterDistributionTest.cpp
diff --git a/Tests/UnitTests/Core/Core/PolarizationHandlerTest.cpp b/Tests/Unit/Param/PolarizationHandlerTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Core/PolarizationHandlerTest.cpp
rename to Tests/Unit/Param/PolarizationHandlerTest.cpp
diff --git a/Tests/UnitTests/Core/Instrument/PrecomputedTest.cpp b/Tests/Unit/Param/PrecomputedTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Instrument/PrecomputedTest.cpp
rename to Tests/Unit/Param/PrecomputedTest.cpp
diff --git a/Tests/UnitTests/Core/Parameters/RangedDistributionTest.cpp b/Tests/Unit/Param/RangedDistributionTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Parameters/RangedDistributionTest.cpp
rename to Tests/Unit/Param/RangedDistributionTest.cpp
diff --git a/Tests/Unit/Resample/CMakeLists.txt b/Tests/Unit/Resample/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3ee2b450ef4493bc58ccd433f41593135f58e212
--- /dev/null
+++ b/Tests/Unit/Resample/CMakeLists.txt
@@ -0,0 +1,10 @@
+include(GoogleTest) # provides gtest_discover_tests
+
+set(test UnitTestResample)
+
+file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
+
+add_executable(${test} ${source_files})
+target_link_libraries(${test} ${BornAgainResample_LIBRARY} gtest)
+
+gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Resample.Unit.)
diff --git a/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp b/Tests/Unit/Resample/FormFactorCoherentSumTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp
rename to Tests/Unit/Resample/FormFactorCoherentSumTest.cpp
diff --git a/Tests/UnitTests/Core/Fresnel/KzComputationTest.cpp b/Tests/Unit/Resample/KzComputationTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Fresnel/KzComputationTest.cpp
rename to Tests/Unit/Resample/KzComputationTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/LayerFillLimitsTest.cpp b/Tests/Unit/Resample/LayerFillLimitsTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/LayerFillLimitsTest.cpp
rename to Tests/Unit/Resample/LayerFillLimitsTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/MaterialTest.cpp b/Tests/Unit/Resample/MaterialTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/MaterialTest.cpp
rename to Tests/Unit/Resample/MaterialTest.cpp
diff --git a/Tests/UnitTests/Core/Fresnel/MatrixRTCoefficientsTest.cpp b/Tests/Unit/Resample/MatrixRTCoefficientsTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Fresnel/MatrixRTCoefficientsTest.cpp
rename to Tests/Unit/Resample/MatrixRTCoefficientsTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp b/Tests/Unit/Resample/MultilayerAveragingTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
rename to Tests/Unit/Resample/MultilayerAveragingTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/Unit/Resample/RTTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/RTTest.cpp
rename to Tests/Unit/Resample/RTTest.cpp
diff --git a/Tests/UnitTests/Core/Core/SimulationElementTest.cpp b/Tests/Unit/Resample/SimulationElementTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Core/SimulationElementTest.cpp
rename to Tests/Unit/Resample/SimulationElementTest.cpp
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp b/Tests/Unit/Resample/SpecularMagneticTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
rename to Tests/Unit/Resample/SpecularMagneticTest.cpp
diff --git a/Tests/Unit/Sample/CMakeLists.txt b/Tests/Unit/Sample/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..908e9f2ffe65866b6a966d648f82c8f725899318
--- /dev/null
+++ b/Tests/Unit/Sample/CMakeLists.txt
@@ -0,0 +1,10 @@
+include(GoogleTest) # provides gtest_discover_tests
+
+set(test UnitTestSample)
+
+file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
+
+add_executable(${test} ${source_files})
+target_link_libraries(${test} ${BornAgainSample_LIBRARY} gtest)
+
+gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Sample.Unit.)
diff --git a/Tests/UnitTests/Core/Sample/CrystalTest.cpp b/Tests/Unit/Sample/CrystalTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/CrystalTest.cpp
rename to Tests/Unit/Sample/CrystalTest.cpp
diff --git a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp b/Tests/Unit/Sample/FTDistributionsTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
rename to Tests/Unit/Sample/FTDistributionsTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp b/Tests/Unit/Sample/FormFactorBasicTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp
rename to Tests/Unit/Sample/FormFactorBasicTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/Lattice2DTest.cpp b/Tests/Unit/Sample/Lattice2DTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/Lattice2DTest.cpp
rename to Tests/Unit/Sample/Lattice2DTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/LatticeTest.cpp b/Tests/Unit/Sample/LatticeTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/LatticeTest.cpp
rename to Tests/Unit/Sample/LatticeTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp b/Tests/Unit/Sample/LayerInterfaceTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
rename to Tests/Unit/Sample/LayerInterfaceTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp b/Tests/Unit/Sample/LayerRoughnessTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp
rename to Tests/Unit/Sample/LayerRoughnessTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/LayerTest.cpp b/Tests/Unit/Sample/LayerTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/LayerTest.cpp
rename to Tests/Unit/Sample/LayerTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp b/Tests/Unit/Sample/MesoCrystalTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp
rename to Tests/Unit/Sample/MesoCrystalTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp b/Tests/Unit/Sample/MultiLayerTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
rename to Tests/Unit/Sample/MultiLayerTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp b/Tests/Unit/Sample/ParticleCompositionTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp
rename to Tests/Unit/Sample/ParticleCompositionTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp b/Tests/Unit/Sample/ParticleCoreShellTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp
rename to Tests/Unit/Sample/ParticleCoreShellTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/ParticleTest.cpp b/Tests/Unit/Sample/ParticleTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/ParticleTest.cpp
rename to Tests/Unit/Sample/ParticleTest.cpp
diff --git a/Tests/UnitTests/Core/Vector/RotationTest.cpp b/Tests/Unit/Sample/RotationTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Vector/RotationTest.cpp
rename to Tests/Unit/Sample/RotationTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/SampleBuilderNodeTest.cpp b/Tests/Unit/Sample/SampleBuilderNodeTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/SampleBuilderNodeTest.cpp
rename to Tests/Unit/Sample/SampleBuilderNodeTest.cpp
diff --git a/Tests/UnitTests/Core/Sample/ZLimitsTest.cpp b/Tests/Unit/Sample/ZLimitsTest.cpp
similarity index 100%
rename from Tests/UnitTests/Core/Sample/ZLimitsTest.cpp
rename to Tests/Unit/Sample/ZLimitsTest.cpp
diff --git a/Tests/UnitTests/gui2/CMakeLists.txt b/Tests/Unit/gui2/CMakeLists.txt
similarity index 100%
rename from Tests/UnitTests/gui2/CMakeLists.txt
rename to Tests/Unit/gui2/CMakeLists.txt
diff --git a/Tests/UnitTests/gui2/data/Untitled 1.csv b/Tests/Unit/gui2/data/Untitled 1.csv
similarity index 100%
rename from Tests/UnitTests/gui2/data/Untitled 1.csv
rename to Tests/Unit/gui2/data/Untitled 1.csv
diff --git a/Tests/UnitTests/gui2/data/bilayer1.txt b/Tests/Unit/gui2/data/bilayer1.txt
similarity index 100%
rename from Tests/UnitTests/gui2/data/bilayer1.txt
rename to Tests/Unit/gui2/data/bilayer1.txt
diff --git a/Tests/UnitTests/gui2/data/bilayer2.txt b/Tests/Unit/gui2/data/bilayer2.txt
similarity index 100%
rename from Tests/UnitTests/gui2/data/bilayer2.txt
rename to Tests/Unit/gui2/data/bilayer2.txt
diff --git a/Tests/UnitTests/gui2/data/bilayer3a.txt b/Tests/Unit/gui2/data/bilayer3a.txt
similarity index 100%
rename from Tests/UnitTests/gui2/data/bilayer3a.txt
rename to Tests/Unit/gui2/data/bilayer3a.txt
diff --git a/Tests/UnitTests/gui2/data/bilayer3b.txt b/Tests/Unit/gui2/data/bilayer3b.txt
similarity index 100%
rename from Tests/UnitTests/gui2/data/bilayer3b.txt
rename to Tests/Unit/gui2/data/bilayer3b.txt
diff --git a/Tests/UnitTests/gui2/data/p15320_00017128_report.csv b/Tests/Unit/gui2/data/p15320_00017128_report.csv
similarity index 100%
rename from Tests/UnitTests/gui2/data/p15320_00017128_report.csv
rename to Tests/Unit/gui2/data/p15320_00017128_report.csv
diff --git a/Tests/UnitTests/gui2/libtestmachinery/CMakeLists.txt b/Tests/Unit/gui2/libtestmachinery/CMakeLists.txt
similarity index 100%
rename from Tests/UnitTests/gui2/libtestmachinery/CMakeLists.txt
rename to Tests/Unit/gui2/libtestmachinery/CMakeLists.txt
diff --git a/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp b/Tests/Unit/gui2/libtestmachinery/folderbasedtest.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp
rename to Tests/Unit/gui2/libtestmachinery/folderbasedtest.cpp
diff --git a/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h b/Tests/Unit/gui2/libtestmachinery/folderbasedtest.h
similarity index 100%
rename from Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h
rename to Tests/Unit/gui2/libtestmachinery/folderbasedtest.h
diff --git a/Tests/UnitTests/gui2/libtestmachinery/google_test.h b/Tests/Unit/gui2/libtestmachinery/google_test.h
similarity index 100%
rename from Tests/UnitTests/gui2/libtestmachinery/google_test.h
rename to Tests/Unit/gui2/libtestmachinery/google_test.h
diff --git a/Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp b/Tests/Unit/gui2/libtestmachinery/test_utils.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp
rename to Tests/Unit/gui2/libtestmachinery/test_utils.cpp
diff --git a/Tests/UnitTests/gui2/libtestmachinery/test_utils.h b/Tests/Unit/gui2/libtestmachinery/test_utils.h
similarity index 97%
rename from Tests/UnitTests/gui2/libtestmachinery/test_utils.h
rename to Tests/Unit/gui2/libtestmachinery/test_utils.h
index 3f0f96a4fbe9025132d785797698f9f357d47ba1..805ad3d2f0ac57458ef888e7eafccc92540afe85 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/test_utils.h
+++ b/Tests/Unit/gui2/libtestmachinery/test_utils.h
@@ -14,7 +14,7 @@
 #include <QString>
 #include <memory>
 
-//! @file Tests/UnitTests/gui2/libtestmachinery/test_utils.h
+//! @file Tests/Unit/gui2/libtestmachinery/test_utils.h
 //! @brief Collection of utility functions for various unit tests.
 
 class QJsonObject;
diff --git a/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp b/Tests/Unit/gui2/libtestmachinery/widgetbasedtest.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp
rename to Tests/Unit/gui2/libtestmachinery/widgetbasedtest.cpp
diff --git a/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h b/Tests/Unit/gui2/libtestmachinery/widgetbasedtest.h
similarity index 100%
rename from Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h
rename to Tests/Unit/gui2/libtestmachinery/widgetbasedtest.h
diff --git a/Tests/UnitTests/gui2/testdareflcore/CMakeLists.txt b/Tests/Unit/gui2/testdareflcore/CMakeLists.txt
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/CMakeLists.txt
rename to Tests/Unit/gui2/testdareflcore/CMakeLists.txt
diff --git a/Tests/UnitTests/gui2/testdareflcore/TestAll.cpp b/Tests/Unit/gui2/testdareflcore/TestAll.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/TestAll.cpp
rename to Tests/Unit/gui2/testdareflcore/TestAll.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/applicationmodels.test.cpp b/Tests/Unit/gui2/testdareflcore/applicationmodels.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/applicationmodels.test.cpp
rename to Tests/Unit/gui2/testdareflcore/applicationmodels.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp b/Tests/Unit/gui2/testdareflcore/datahandler.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
rename to Tests/Unit/gui2/testdareflcore/datahandler.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp b/Tests/Unit/gui2/testdareflcore/dataloader_utils.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
rename to Tests/Unit/gui2/testdareflcore/dataloader_utils.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp b/Tests/Unit/gui2/testdareflcore/dataselectionmodel.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
rename to Tests/Unit/gui2/testdareflcore/dataselectionmodel.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp b/Tests/Unit/gui2/testdareflcore/defaultparser.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
rename to Tests/Unit/gui2/testdareflcore/defaultparser.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/experimentaldatamodel.test.cpp b/Tests/Unit/gui2/testdareflcore/experimentaldatamodel.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/experimentaldatamodel.test.cpp
rename to Tests/Unit/gui2/testdareflcore/experimentaldatamodel.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp b/Tests/Unit/gui2/testdareflcore/importdataeditoractions.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
rename to Tests/Unit/gui2/testdareflcore/importdataeditoractions.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp b/Tests/Unit/gui2/testdareflcore/importtableheader.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
rename to Tests/Unit/gui2/testdareflcore/importtableheader.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/instrumentitems.test.cpp b/Tests/Unit/gui2/testdareflcore/instrumentitems.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/instrumentitems.test.cpp
rename to Tests/Unit/gui2/testdareflcore/instrumentitems.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp b/Tests/Unit/gui2/testdareflcore/layereditoractions.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
rename to Tests/Unit/gui2/testdareflcore/layereditoractions.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp b/Tests/Unit/gui2/testdareflcore/layerelements.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
rename to Tests/Unit/gui2/testdareflcore/layerelements.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp b/Tests/Unit/gui2/testdareflcore/layeritems.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
rename to Tests/Unit/gui2/testdareflcore/layeritems.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp b/Tests/Unit/gui2/testdareflcore/layerselectionmodel.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
rename to Tests/Unit/gui2/testdareflcore/layerselectionmodel.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp b/Tests/Unit/gui2/testdareflcore/layerviewmodel.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
rename to Tests/Unit/gui2/testdareflcore/layerviewmodel.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/materialprofile.test.cpp b/Tests/Unit/gui2/testdareflcore/materialprofile.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/materialprofile.test.cpp
rename to Tests/Unit/gui2/testdareflcore/materialprofile.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/modelutils.test.cpp b/Tests/Unit/gui2/testdareflcore/modelutils.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/modelutils.test.cpp
rename to Tests/Unit/gui2/testdareflcore/modelutils.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp b/Tests/Unit/gui2/testdareflcore/quicksimutils.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
rename to Tests/Unit/gui2/testdareflcore/quicksimutils.test.cpp
diff --git a/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp b/Tests/Unit/gui2/testdareflcore/sldelementcontroller.test.cpp
similarity index 100%
rename from Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
rename to Tests/Unit/gui2/testdareflcore/sldelementcontroller.test.cpp