diff --git a/targets/apps/LBM/streetTest/CMakePackage.cmake b/targets/apps/LBM/streetTest/CMakePackage.cmake
deleted file mode 100644
index 5d39e3804dbd180790629111449a7dc918292430..0000000000000000000000000000000000000000
--- a/targets/apps/LBM/streetTest/CMakePackage.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-addFileEndingToCollect("*.cu")
-addFileEndingToCollect("*.cuh")
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
\ No newline at end of file
diff --git a/targets/libs/Core/3rdPartyLinking.cmake b/targets/libs/Core/3rdPartyLinking.cmake
deleted file mode 100644
index 9c7eff417d7dbf4afc6f7336f28a0cd1bf354f69..0000000000000000000000000000000000000000
--- a/targets/libs/Core/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "thread;serialization")
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
-#linkJsonCpp(${targetName})
\ No newline at end of file
diff --git a/targets/libs/Core/CMakeLists.txt b/targets/libs/Core/CMakeLists.txt
deleted file mode 100644
index b27eb99bff9a47ba025ce2176cd9de200af0cbd9..0000000000000000000000000000000000000000
--- a/targets/libs/Core/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-MESSAGE( STATUS ${CMAKE_CURRENT_LIST_DIR} )
-
-set(linkDirectories "")
-set(libsToLink "")
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName})
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-include(buildInfo.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/Core/CMakePackage.cmake b/targets/libs/Core/CMakePackage.cmake
deleted file mode 100644
index 96a822d95d1c791acd0eb9ef4bfc3ef09bc84eda..0000000000000000000000000000000000000000
--- a/targets/libs/Core/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-#includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/libs/Core/buildInfo.cmake b/targets/libs/Core/buildInfo.cmake
deleted file mode 100644
index 4dd877bae6ea37f375bd49bc1b2d8c6236d69dfc..0000000000000000000000000000000000000000
--- a/targets/libs/Core/buildInfo.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-set(buildInfoPath ${CMAKE_BINARY_DIR}/buildInfo)
-set(buildInfoFile buildInfo.cpp)
-#set(buildInfoFileHeader buildInfo.h)
-set(buildInfoInput ${CMAKE_CURRENT_LIST_DIR}/buildInfoInput/buildInfo.in.cpp)
-
-include(${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/git/GetGitRevisionDescription.cmake)
-get_git_head_revision(git_branch git_commit_hash)
-
-set(COMPILER_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}} ${CMAKE_CXX_FLAGS}")
-
-configure_file(${buildInfoInput} ${buildInfoPath}/${buildInfoFile})
-
-include_directories(${buildInfoPath})
-#set(MY_SRCS ${MY_SRCS} ${buildInfoPath}/${buildInfoFile} ${CMAKE_CURRENT_LIST_DIR}/${buildInfoFileHeader})
-set(MY_SRCS ${MY_SRCS} ${buildInfoPath}/${buildInfoFile})
-source_group("" FILES ${buildInfoPath}/${buildInfoFile})
-#source_group("" FILES ${CMAKE_CURRENT_LIST_DIR}/${buildInfoFileHeader})
\ No newline at end of file
diff --git a/targets/libs/Core/buildInfoInput/buildInfo.in.cpp b/targets/libs/Core/buildInfoInput/buildInfo.in.cpp
deleted file mode 100644
index f3df466c582db288e3252367c4247d70cb0d53ef..0000000000000000000000000000000000000000
--- a/targets/libs/Core/buildInfoInput/buildInfo.in.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "VirtualFluidsDefinitions.h"
-
-namespace buildInfo
-{
- VF_PUBLIC const char *gitCommitHash() { return "@git_commit_hash@"; }
- VF_PUBLIC const char *gitBranch() { return "@git_branch@"; }
- VF_PUBLIC const char *buildType() { return "@CMAKE_BUILD_TYPE@"; }
- VF_PUBLIC const char *compilerFlags() { return "@COMPILER_FLAGS@"; }
- VF_PUBLIC const char *buildMachine() { return "@BUILD_computerName@";}
- VF_PUBLIC const char *projectDir() { return "@CMAKE_SOURCE_DIR@"; }
- VF_PUBLIC const char *binaryDir() { return "@CMAKE_BINARY_DIR@"; }
-}
diff --git a/targets/libs/GksGpu/3rdPartyLinking.cmake b/targets/libs/GksGpu/3rdPartyLinking.cmake
deleted file mode 100644
index ede6d1c726b5dde51d97495345169c7840bbf3fd..0000000000000000000000000000000000000000
--- a/targets/libs/GksGpu/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/OpenMP/Link.cmake)
-linkOpenMP(${targetName})
diff --git a/targets/libs/GksGpu/CMakeLists.txt b/targets/libs/GksGpu/CMakeLists.txt
deleted file mode 100644
index 477314aa7f7c897f1eb97514e4066a0d80f7f592..0000000000000000000000000000000000000000
--- a/targets/libs/GksGpu/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-set(libsToLink GksMeshAdapter Core)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
- ${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/GksMeshAdapter
- ${CMAKE_SOURCE_DIR}/src/Core )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${gksLibraryFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/GksMeshAdapter/3rdPartyLinking.cmake b/targets/libs/GksMeshAdapter/3rdPartyLinking.cmake
deleted file mode 100644
index 838d1037e56d1a5448881d07f5ff60568e3df0fb..0000000000000000000000000000000000000000
--- a/targets/libs/GksMeshAdapter/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-#linkBoost(${targetName} "serialization")
diff --git a/targets/libs/GksMeshAdapter/CMakeLists.txt b/targets/libs/GksMeshAdapter/CMakeLists.txt
deleted file mode 100644
index fadfa86572b9f6f00aa674fcea875038b7400519..0000000000000000000000000000000000000000
--- a/targets/libs/GksMeshAdapter/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-set(libsToLink GridGenerator Core)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
- ${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/GridGenerator
- ${CMAKE_SOURCE_DIR}/src/Core )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${gksLibraryFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/GksVtkAdapter/CMakePackage.cmake b/targets/libs/GksVtkAdapter/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe087d1886a7dbdbfb7298bae1fc7ddedd..0000000000000000000000000000000000000000
--- a/targets/libs/GksVtkAdapter/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/libs/GridGenerator/3rdPartyLinking.cmake b/targets/libs/GridGenerator/3rdPartyLinking.cmake
deleted file mode 100644
index 303712437faec680c1256192b9a3cfb53a2a8ec8..0000000000000000000000000000000000000000
--- a/targets/libs/GridGenerator/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "serialization")
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Metis/Link.cmake)
-#linkMetis(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/OpenMP/Link.cmake)
-linkOpenMP(${targetName})
diff --git a/targets/libs/GridGenerator/CMakeLists.txt b/targets/libs/GridGenerator/CMakeLists.txt
deleted file mode 100644
index 460d60d031f9b67a863cb972c5562e42dc483d4f..0000000000000000000000000000000000000000
--- a/targets/libs/GridGenerator/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-set(libsToLink VirtualFluidsBasics Core)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
- ${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/VirtualFluidsBasics
- ${CMAKE_SOURCE_DIR}/src/Core )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-set_property(TARGET ${targetName} PROPERTY CUDA_SEPARABLE_COMPILATION ON)
-
-# Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/GridGenerator/CMakePackage.cmake b/targets/libs/GridGenerator/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe087d1886a7dbdbfb7298bae1fc7ddedd..0000000000000000000000000000000000000000
--- a/targets/libs/GridGenerator/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/libs/Traffic/CMakePackage.cmake b/targets/libs/Traffic/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe087d1886a7dbdbfb7298bae1fc7ddedd..0000000000000000000000000000000000000000
--- a/targets/libs/Traffic/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/libs/VirtualFluidsBasics/3rdPartyLinking.cmake b/targets/libs/VirtualFluidsBasics/3rdPartyLinking.cmake
deleted file mode 100644
index 9c7eff417d7dbf4afc6f7336f28a0cd1bf354f69..0000000000000000000000000000000000000000
--- a/targets/libs/VirtualFluidsBasics/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "thread;serialization")
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-#include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
-#linkJsonCpp(${targetName})
\ No newline at end of file
diff --git a/targets/libs/VirtualFluidsBasics/CMakeLists.txt b/targets/libs/VirtualFluidsBasics/CMakeLists.txt
deleted file mode 100644
index 32d79ad49704a7054ebd65efdae8478243774555..0000000000000000000000000000000000000000
--- a/targets/libs/VirtualFluidsBasics/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-set(libsToLink Core)
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
- ${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/Core )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/VirtualFluidsBasics/CMakePackage.cmake b/targets/libs/VirtualFluidsBasics/CMakePackage.cmake
deleted file mode 100644
index 96a822d95d1c791acd0eb9ef4bfc3ef09bc84eda..0000000000000000000000000000000000000000
--- a/targets/libs/VirtualFluidsBasics/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-#includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake b/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake
deleted file mode 100644
index 6feb9029ed32c85c31304372e4be8554464f5e7c..0000000000000000000000000000000000000000
--- a/targets/libs/VirtualFluids_GPU/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
-linkCuda(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/MPI/Link.cmake)
-linkMPI(${targetName})
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName} "serialization")
\ No newline at end of file
diff --git a/targets/libs/VirtualFluids_GPU/CMakeLists.txt b/targets/libs/VirtualFluids_GPU/CMakeLists.txt
deleted file mode 100644
index a21a91764d73fa30b84bee99a3eb238a7b1bceb1..0000000000000000000000000000000000000000
--- a/targets/libs/VirtualFluids_GPU/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
-
-set(linkDirectories "")
-
-IF(MSVC)
- set(libsToLink ws2_32 GridGenerator VirtualFluidsBasics Core Traffic) # ws_32 throws an error on Phoenix
-ELSE(MSVC)
- #set(libsToLink GridGenerator VirtualFluidsBasics Core Traffic)
- set(libsToLink GridGenerator VirtualFluidsBasics Core)
-ENDIF(MSVC)
-
-set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
- ${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/GridGenerator
- ${CMAKE_SOURCE_DIR}/src/VirtualFluidsBasics
- ${CMAKE_SOURCE_DIR}/src/Core
- ${CMAKE_SOURCE_DIR}/src/Traffic
- )
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-#SET(TPN_WIN32 "/EHsc")
-#https://stackoverflow.com/questions/6832666/lnk2019-when-including-asio-headers-solution-generated-with-cmake
-#https://stackoverflow.com/questions/27442885/syntax-error-with-stdnumeric-limitsmax
-
-buildLib(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${libraryFolder})
-
-IF(MSVC)
- set_target_properties(${targetName} PROPERTIES LINK_FLAGS "/ignore:4251")
-ENDIF(MSVC)
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/libs/VirtualFluids_GPU/CMakePackage.cmake b/targets/libs/VirtualFluids_GPU/CMakePackage.cmake
deleted file mode 100644
index 7ec316fe087d1886a7dbdbfb7298bae1fc7ddedd..0000000000000000000000000000000000000000
--- a/targets/libs/VirtualFluids_GPU/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveProductionFilesFrom(${targetName} ${CMAKE_SOURCE_DIR}/src/${targetName})
\ No newline at end of file
diff --git a/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/package.include b/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/package.include b/targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Tests/NyTest/package.include b/targets/tests/NumericalTests/Tests/NyTest/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/package.include b/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/package.include b/targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Tests/PhiTest/package.include b/targets/tests/NumericalTests/Tests/PhiTest/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/package.include b/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/package.include b/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/package.include b/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/package.include b/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Calculator/package.include b/targets/tests/NumericalTests/Utilities/Calculator/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/package.include b/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/package.include b/targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/package.include b/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include b/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/DataWriter/package.include b/targets/tests/NumericalTests/Utilities/DataWriter/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/InitialCondition/package.include b/targets/tests/NumericalTests/Utilities/InitialCondition/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/KernelConfiguration/package.include b/targets/tests/NumericalTests/Utilities/KernelConfiguration/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileQueue/package.include b/targets/tests/NumericalTests/Utilities/LogFileQueue/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/LogFileWriter/package.include b/targets/tests/NumericalTests/Utilities/LogFileWriter/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestFactory/package.include b/targets/tests/NumericalTests/Utilities/NumericalTestFactory/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestGridReader/package.include b/targets/tests/NumericalTests/Utilities/NumericalTestGridReader/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestSimulation/package.include b/targets/tests/NumericalTests/Utilities/NumericalTestSimulation/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestSuite/package.include b/targets/tests/NumericalTests/Utilities/NumericalTestSuite/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/package.include b/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/package.include b/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Results/SimulationResults/package.include b/targets/tests/NumericalTests/Utilities/Results/SimulationResults/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Results/package.include b/targets/tests/NumericalTests/Utilities/Results/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/SimulationInfo/package.include b/targets/tests/NumericalTests/Utilities/SimulationInfo/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/SimulationParameter/package.include b/targets/tests/NumericalTests/Utilities/SimulationParameter/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Structs/package.include b/targets/tests/NumericalTests/Utilities/Structs/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Test/package.include b/targets/tests/NumericalTests/Utilities/Test/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/TestQueue/package.include b/targets/tests/NumericalTests/Utilities/TestQueue/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/TestSimulation/package.include b/targets/tests/NumericalTests/Utilities/TestSimulation/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/Time/package.include b/targets/tests/NumericalTests/Utilities/Time/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/package.include b/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/package.include b/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/NumericalTests/package.include b/targets/tests/NumericalTests/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000