diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.cpp b/targets/tests/NumericalTests/Simulation/ShearWave/InitialConditions/InitialConditionShearWave.cpp
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.cpp
rename to targets/tests/NumericalTests/Simulation/ShearWave/InitialConditions/InitialConditionShearWave.cpp
diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.h b/targets/tests/NumericalTests/Simulation/ShearWave/InitialConditions/InitialConditionShearWave.h
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.h
rename to targets/tests/NumericalTests/Simulation/ShearWave/InitialConditions/InitialConditionShearWave.h
diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/package.include b/targets/tests/NumericalTests/Simulation/ShearWave/InitialConditions/package.include
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/package.include
rename to targets/tests/NumericalTests/Simulation/ShearWave/InitialConditions/package.include
diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp b/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp
rename to targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp
diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h b/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h
rename to targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h
diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/package.include b/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/package.include
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/package.include
rename to targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/package.include
diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/TestParameter/ShearWaveTestParameter.cpp b/targets/tests/NumericalTests/Simulation/ShearWave/TestParameter/ShearWaveTestParameter.cpp
similarity index 96%
rename from targets/tests/NumericalTests/Simulations/ShearWave/TestParameter/ShearWaveTestParameter.cpp
rename to targets/tests/NumericalTests/Simulation/ShearWave/TestParameter/ShearWaveTestParameter.cpp
index cc2abd21dc1cf43c00e8ba58654c123bb8818f51..7499608e466ed8800163835bfb1ae09fbd5dd3d9 100644
--- a/targets/tests/NumericalTests/Simulations/ShearWave/TestParameter/ShearWaveTestParameter.cpp
+++ b/targets/tests/NumericalTests/Simulation/ShearWave/TestParameter/ShearWaveTestParameter.cpp
@@ -1,6 +1,6 @@
 #include "ShearWaveTestParameter.h"
 
-#include "Simulations/ShearWave/InitialConditions/InitialConditionShearWave.h"
+#include "Simulation/ShearWave/InitialConditions/InitialConditionShearWave.h"
 #include "Utilities/Calculator/FFTCalculator/VzFFTCalculator/VzFFTCalculator.h"
 #include "Tests/PhiAndNuTest/PhiAndNuTest.h"
 #include "Utilities/SimulationResults/SimulationResults.h"
diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/TestParameter/ShearWaveTestParameter.h b/targets/tests/NumericalTests/Simulation/ShearWave/TestParameter/ShearWaveTestParameter.h
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/ShearWave/TestParameter/ShearWaveTestParameter.h
rename to targets/tests/NumericalTests/Simulation/ShearWave/TestParameter/ShearWaveTestParameter.h
diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/TestParameter/package.include b/targets/tests/NumericalTests/Simulation/ShearWave/TestParameter/package.include
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/ShearWave/TestParameter/package.include
rename to targets/tests/NumericalTests/Simulation/ShearWave/TestParameter/package.include
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortex/InitialConditions/InitialConditionTaylorGreenVortex.cpp b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/InitialConditions/InitialConditionTaylorGreenVortex.cpp
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/TaylorGreenVortex/InitialConditions/InitialConditionTaylorGreenVortex.cpp
rename to targets/tests/NumericalTests/Simulation/TaylorGreenVortex/InitialConditions/InitialConditionTaylorGreenVortex.cpp
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortex/InitialConditions/InitialConditionTaylorGreenVortex.h b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/InitialConditions/InitialConditionTaylorGreenVortex.h
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/TaylorGreenVortex/InitialConditions/InitialConditionTaylorGreenVortex.h
rename to targets/tests/NumericalTests/Simulation/TaylorGreenVortex/InitialConditions/InitialConditionTaylorGreenVortex.h
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortex/InitialConditions/package.include b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/InitialConditions/package.include
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/TaylorGreenVortex/InitialConditions/package.include
rename to targets/tests/NumericalTests/Simulation/TaylorGreenVortex/InitialConditions/package.include
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.cpp b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.cpp
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.cpp
rename to targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.cpp
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.h b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.h
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.h
rename to targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.h
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortex/LogFileInformation/package.include b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/package.include
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/TaylorGreenVortex/LogFileInformation/package.include
rename to targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/package.include
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.cpp b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.cpp
similarity index 95%
rename from targets/tests/NumericalTests/Simulations/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.cpp
rename to targets/tests/NumericalTests/Simulation/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.cpp
index 17c095ae8c275af690711d0ddb34ac739bbf0198..d34afedf2ccb74e30e65845cdf12c5dd1bc60a6c 100644
--- a/targets/tests/NumericalTests/Simulations/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.cpp
+++ b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.cpp
@@ -1,6 +1,6 @@
 #include "TaylorGreenTestParameter.h"
 
-#include "Simulations/TaylorGreenVortex/InitialConditions/InitialConditionTaylorGreenVortex.h"
+#include "Simulation/TaylorGreenVortex/InitialConditions/InitialConditionTaylorGreenVortex.h"
 #include "Utilities/Calculator/FFTCalculator/VxFFTCalculator/VxFFTCalculator.h"
 #include "Tests/PhiAndNuTest/PhiAndNuTest.h"
 #include "Utilities/SimulationResults/SimulationResults.h"
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.h b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.h
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.h
rename to targets/tests/NumericalTests/Simulation/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.h
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortex/TestParameter/package.include b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/TestParameter/package.include
similarity index 100%
rename from targets/tests/NumericalTests/Simulations/TaylorGreenVortex/TestParameter/package.include
rename to targets/tests/NumericalTests/Simulation/TaylorGreenVortex/TestParameter/package.include
diff --git a/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp
index 8c533214f2d3e783a97cf226e2d46afea44142df..cca3537e37835b2bb01e5cc311df06e5acccf1fa 100644
--- a/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp
+++ b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp
@@ -10,10 +10,10 @@
 #include "Utilities/TestCout/TestCoutImp.h"
 #include "Utilities/SimulationInfo/SimulationInfoImp.h"
 
-#include "Simulations/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.h"
-#include "Simulations/ShearWave/TestParameter/ShearWaveTestParameter.h"
-#include "Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h"
-#include "Simulations/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.h"
+#include "Simulation/TaylorGreenVortex/TestParameter/TaylorGreenTestParameter.h"
+#include "Simulation/ShearWave/TestParameter/ShearWaveTestParameter.h"
+#include "Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h"
+#include "Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.h"
 
 
 #include "Tests/PhiAndNuTest/PhiAndNuTest.h"