diff --git a/Testing/Core/CMakeLists.txt b/Testing/Code/ApplicationEngine/CMakeLists.txt
similarity index 100%
rename from Testing/Core/CMakeLists.txt
rename to Testing/Code/ApplicationEngine/CMakeLists.txt
diff --git a/Testing/Core/otbWrapperApplicationRegistryTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperApplicationRegistryTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperApplicationRegistryTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperApplicationRegistryTest.cxx
diff --git a/Testing/Core/otbWrapperApplicationTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperApplicationTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperApplicationTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperApplicationTest.cxx
diff --git a/Testing/Core/otbWrapperChoiceParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperChoiceParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperChoiceParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperChoiceParameterTest.cxx
diff --git a/Testing/Core/otbWrapperCoreTests.cxx b/Testing/Code/ApplicationEngine/otbWrapperCoreTests.cxx
similarity index 100%
rename from Testing/Core/otbWrapperCoreTests.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperCoreTests.cxx
diff --git a/Testing/Core/otbWrapperEmptyParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperEmptyParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperEmptyParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperEmptyParameterTest.cxx
diff --git a/Testing/Core/otbWrapperInputImageListParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperInputImageListParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperInputImageListParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperInputImageListParameterTest.cxx
diff --git a/Testing/Core/otbWrapperInputImageParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperInputImageParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperInputImageParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperInputImageParameterTest.cxx
diff --git a/Testing/Core/otbWrapperInputVectorDataParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperInputVectorDataParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperInputVectorDataParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperInputVectorDataParameterTest.cxx
diff --git a/Testing/Core/otbWrapperNumericalParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperNumericalParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperNumericalParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperNumericalParameterTest.cxx
diff --git a/Testing/Core/otbWrapperOutputImageListParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperOutputImageListParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperOutputImageListParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperOutputImageListParameterTest.cxx
diff --git a/Testing/Core/otbWrapperOutputImageParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperOutputImageParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperOutputImageParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperOutputImageParameterTest.cxx
diff --git a/Testing/Core/otbWrapperParameterKeyTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperParameterKeyTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperParameterKeyTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperParameterKeyTest.cxx
diff --git a/Testing/Core/otbWrapperParameterListTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperParameterListTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperParameterListTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperParameterListTest.cxx
diff --git a/Testing/Core/otbWrapperParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperParameterTest.cxx
diff --git a/Testing/Core/otbWrapperStringListParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperStringListParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperStringListParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperStringListParameterTest.cxx
diff --git a/Testing/Core/otbWrapperStringParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperStringParameterTest.cxx
similarity index 100%
rename from Testing/Core/otbWrapperStringParameterTest.cxx
rename to Testing/Code/ApplicationEngine/otbWrapperStringParameterTest.cxx