diff --git a/applications/FluidDynamicsApplication/custom_elements/alternative_d_vms_dem_coupled.cpp b/applications/FluidDynamicsApplication/custom_elements/alternative_d_vms_dem_coupled.cpp
index 5a3c11015b60..5f94018fd6fc 100644
--- a/applications/FluidDynamicsApplication/custom_elements/alternative_d_vms_dem_coupled.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/alternative_d_vms_dem_coupled.cpp
@@ -18,7 +18,7 @@
 
 // Aplication includes
 #include "alternative_d_vms_dem_coupled.h"
-#include "custom_utilities/qsvms_dem_coupled_data.h"
+#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
 #include "custom_utilities/fluid_element_utilities.h"
 #include "fluid_dynamics_application_variables.h"
 
diff --git a/applications/FluidDynamicsApplication/custom_elements/alternative_qs_vms_dem_coupled.cpp b/applications/FluidDynamicsApplication/custom_elements/alternative_qs_vms_dem_coupled.cpp
index 48bbf8b2c40b..8db456af6ea6 100644
--- a/applications/FluidDynamicsApplication/custom_elements/alternative_qs_vms_dem_coupled.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/alternative_qs_vms_dem_coupled.cpp
@@ -17,7 +17,7 @@
 
 // Aplication includes
 #include "alternative_qs_vms_dem_coupled.h"
-#include "custom_utilities/qsvms_dem_coupled_data.h"
+#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
 #include "custom_utilities/fluid_element_utilities.h"
 #include "fluid_dynamics_application_variables.h"
 #include "utilities/sparse_matrix_multiplication_utility.h"
diff --git a/applications/FluidDynamicsApplication/custom_elements/d_vms.cpp b/applications/FluidDynamicsApplication/custom_elements/d_vms.cpp
index a73166a5bc1a..3cc6f130d8c9 100644
--- a/applications/FluidDynamicsApplication/custom_elements/d_vms.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/d_vms.cpp
@@ -14,9 +14,9 @@
 #include "includes/cfd_variables.h"
 #include "includes/checks.h"
 
-#include "custom_utilities/qsvms_data.h"
-#include "custom_utilities/qsvms_dem_coupled_data.h"
-//#include "custom_utilities/time_integrated_qsvms_data.h"
+#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"
+#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
+//#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
 #include "custom_utilities/fluid_element_utilities.h"
 
 namespace Kratos
diff --git a/applications/FluidDynamicsApplication/custom_elements/d_vms_dem_coupled.cpp b/applications/FluidDynamicsApplication/custom_elements/d_vms_dem_coupled.cpp
index 19b1e91047a9..de1d418844b2 100644
--- a/applications/FluidDynamicsApplication/custom_elements/d_vms_dem_coupled.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/d_vms_dem_coupled.cpp
@@ -18,7 +18,7 @@
 
 // Aplication includes
 #include "d_vms_dem_coupled.h"
-#include "custom_utilities/qsvms_dem_coupled_data.h"
+#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
 #include "custom_utilities/fluid_element_utilities.h"
 #include "fluid_dynamics_application_variables.h"
 
diff --git a/applications/FluidDynamicsApplication/custom_elements/data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h
index 75b071f8894b..c6dfea60dd31 100644
--- a/applications/FluidDynamicsApplication/custom_elements/data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h
@@ -22,7 +22,7 @@
 
 // Application includes
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 #include "utilities/element_size_calculator.h"
 
 namespace Kratos {
@@ -48,6 +48,8 @@ using NodalVectorData = typename FluidElementData<TDim,TNumNodes, true>::NodalVe
 using ShapeFunctionsType = typename FluidElementData<TDim,TNumNodes, true>::ShapeFunctionsType;
 using MatrixRowType = typename FluidElementData<TDim,TNumNodes, true>::MatrixRowType;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{
diff --git a/applications/FluidDynamicsApplication/custom_utilities/embedded_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_data.h
similarity index 95%
rename from applications/FluidDynamicsApplication/custom_utilities/embedded_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_data.h
index b18e58785b45..af38acbb796e 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/embedded_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_data.h
@@ -14,7 +14,7 @@
 #define KRATOS_EMBEDDED_DATA_H
 
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 
 namespace Kratos {
 
@@ -38,6 +38,8 @@ using NodalVectorData = typename TFluidData::NodalVectorData;
 typedef GeometryData::ShapeFunctionsGradientsType ShapeFunctionsGradientsType;
 typedef std::vector<array_1d<double,3>> InterfaceNormalsType;
 
+static constexpr std::size_t BlockSize = TFluidData::BlockSize;
+
 ///@}
 ///@name Public Members
 ///@{
diff --git a/applications/FluidDynamicsApplication/custom_utilities/embedded_discontinuous_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_discontinuous_data.h
similarity index 96%
rename from applications/FluidDynamicsApplication/custom_utilities/embedded_discontinuous_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_discontinuous_data.h
index 99f3e7f626c3..25a3fd5f5fe6 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/embedded_discontinuous_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/embedded_discontinuous_data.h
@@ -14,7 +14,7 @@
 #define KRATOS_EMBEDDED_DISCONTINUOUS_DATA_H
 
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 
 namespace Kratos {
 
@@ -38,6 +38,9 @@ using NodalVectorData = typename TFluidData::NodalVectorData;
 typedef GeometryData::ShapeFunctionsGradientsType ShapeFunctionsGradientsType;
 typedef std::vector<array_1d<double,3>> InterfaceNormalsType;
 
+/// Number of nodal unknowns (taken from underlying element data)
+static constexpr std::size_t BlockSize = TFluidData::BlockSize;
+
 /// Number of edges of the element (simplex elements are assumed)
 constexpr static std::size_t NumEdges = (TFluidData::NumNodes == 3) ? 3 : 6;
 
diff --git a/applications/FluidDynamicsApplication/custom_utilities/fic_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/fic/fic_data.h
similarity index 96%
rename from applications/FluidDynamicsApplication/custom_utilities/fic_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/fic/fic_data.h
index 565c9b53bcc1..0892057805e1 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/fic_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/fic/fic_data.h
@@ -15,7 +15,7 @@
 #define KRATOS_FIC_DATA_H
 
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 
 namespace Kratos {
 
@@ -36,6 +36,8 @@ class FICData : public FluidElementData<TDim,TNumNodes, TElementIntegratesInTime
 using NodalScalarData = typename FluidElementData<TDim,TNumNodes, false>::NodalScalarData;
 using NodalVectorData = typename FluidElementData<TDim,TNumNodes, false>::NodalVectorData;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{
diff --git a/applications/FluidDynamicsApplication/custom_utilities/fluid_element_data.cpp b/applications/FluidDynamicsApplication/custom_elements/data_containers/fluid_element_data.cpp
similarity index 100%
rename from applications/FluidDynamicsApplication/custom_utilities/fluid_element_data.cpp
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/fluid_element_data.cpp
diff --git a/applications/FluidDynamicsApplication/custom_utilities/fluid_element_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/fluid_element_data.h
similarity index 100%
rename from applications/FluidDynamicsApplication/custom_utilities/fluid_element_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/fluid_element_data.h
diff --git a/applications/FluidDynamicsApplication/custom_utilities/qsvms_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms/qs_vms_data.h
similarity index 96%
rename from applications/FluidDynamicsApplication/custom_utilities/qsvms_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms/qs_vms_data.h
index 359920ad12a1..4d832cb5f982 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/qsvms_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms/qs_vms_data.h
@@ -14,7 +14,7 @@
 #define KRATOS_QSVMS_DATA_H
 
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 #include "utilities/element_size_calculator.h"
 
 namespace Kratos {
@@ -36,6 +36,8 @@ class QSVMSData : public FluidElementData<TDim,TNumNodes, TElementIntegratesInTi
 using NodalScalarData = typename FluidElementData<TDim,TNumNodes, false>::NodalScalarData;
 using NodalVectorData = typename FluidElementData<TDim,TNumNodes, false>::NodalVectorData;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{
diff --git a/applications/FluidDynamicsApplication/custom_utilities/qsvms_dem_coupled_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h
similarity index 93%
rename from applications/FluidDynamicsApplication/custom_utilities/qsvms_dem_coupled_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h
index b1c40a3e903f..d5e4df4e1394 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/qsvms_dem_coupled_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h
@@ -24,8 +24,8 @@
 
 // Application includes
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fluid_element_data.h"
-#include "custom_utilities/qsvms_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
+#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"
 
 namespace Kratos {
 
@@ -46,8 +46,7 @@ class QSVMSDEMCoupledData : public QSVMSData<TDim, TNumNodes, TElementIntegrates
 
 constexpr static unsigned int Dim = TDim;
 constexpr static unsigned int NumNodes = TNumNodes;
-constexpr static unsigned int BlockSize = Dim + 2;
-constexpr static unsigned int DofSize = NumNodes * BlockSize;
+constexpr static unsigned int BlockSize = Dim + 1;
 constexpr static bool ElementIntegratesInTime = TElementIntegratesInTime;
 
 using NodalScalarData = typename FluidElementData<TDim,TNumNodes, false>::NodalScalarData;
diff --git a/applications/FluidDynamicsApplication/custom_utilities/symbolic_stokes_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/stokes/stokes_data.h
similarity index 97%
rename from applications/FluidDynamicsApplication/custom_utilities/symbolic_stokes_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/stokes/stokes_data.h
index 9a872ce75a7a..1b8a3bf4c0d7 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/symbolic_stokes_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/stokes/stokes_data.h
@@ -22,7 +22,7 @@
 
 // Application includes
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 #include "utilities/element_size_calculator.h"
 
 namespace Kratos {
@@ -46,6 +46,8 @@ using NodalVectorData = typename FluidElementData<TDim, TNumNodes, true>::NodalV
 using ShapeFunctionsType = typename FluidElementData<TDim, TNumNodes, true>::ShapeFunctionsType;
 using MatrixRowType = typename FluidElementData<TDim, TNumNodes, true>::MatrixRowType;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{
diff --git a/applications/FluidDynamicsApplication/custom_utilities/time_integrated_fic_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h
similarity index 94%
rename from applications/FluidDynamicsApplication/custom_utilities/time_integrated_fic_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h
index 9f4eb850fd8b..14075e40d076 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/time_integrated_fic_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h
@@ -14,7 +14,7 @@
 #define KRATOS_TIME_INTEGRATED_FIC_DATA_H
 
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fic_data.h"
+#include "custom_elements/data_containers/fic/fic_data.h"
 
 namespace Kratos {
 
@@ -35,6 +35,8 @@ class TimeIntegratedFICData : public FICData<TDim,TNumNodes,true>
 using NodalScalarData = typename FluidElementData<TDim,TNumNodes, false>::NodalScalarData;
 using NodalVectorData = typename FluidElementData<TDim,TNumNodes, false>::NodalVectorData;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{
diff --git a/applications/FluidDynamicsApplication/custom_utilities/time_integrated_qsvms_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h
similarity index 93%
rename from applications/FluidDynamicsApplication/custom_utilities/time_integrated_qsvms_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h
index cb0c6a7d8ea2..f34108f6a624 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/time_integrated_qsvms_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h
@@ -14,7 +14,7 @@
 #define KRATOS_TIME_INTEGRATED_QSVMS_DATA_H
 
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/qsvms_data.h"
+#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"
 
 namespace Kratos {
 
@@ -35,6 +35,8 @@ class TimeIntegratedQSVMSData : public QSVMSData<TDim,TNumNodes,true>
 using NodalScalarData = typename FluidElementData<TDim,TNumNodes, false>::NodalScalarData;
 using NodalVectorData = typename FluidElementData<TDim,TNumNodes, false>::NodalVectorData;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{
diff --git a/applications/FluidDynamicsApplication/custom_utilities/two_fluid_navier_stokes_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h
similarity index 99%
rename from applications/FluidDynamicsApplication/custom_utilities/two_fluid_navier_stokes_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h
index f99a2e922792..ceaa2bc1e7a1 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/two_fluid_navier_stokes_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h
@@ -17,7 +17,7 @@
 #include "includes/constitutive_law.h"
 
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 #include "utilities/element_size_calculator.h"
 #include "custom_utilities/fluid_element_utilities.h"
 
@@ -45,6 +45,8 @@ using MatrixRowType = typename FluidElementData<TDim, TNumNodes, true>::MatrixRo
 typedef Geometry<Node> GeometryType;
 typedef GeometryType::ShapeFunctionsGradientsType ShapeFunctionsGradientsType;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{
@@ -128,7 +130,7 @@ void Initialize(const Element& rElement, const ProcessInfo& rProcessInfo) overri
     this->FillFromProcessInfo(DeltaTime,DELTA_TIME,rProcessInfo);
     this->FillFromProcessInfo(DynamicTau,DYNAMIC_TAU,rProcessInfo);
     this->FillFromProcessInfo(VolumeError,VOLUME_ERROR,rProcessInfo);
-    
+
     const Vector& BDFVector = rProcessInfo[BDF_COEFFICIENTS];
     bdf0 = BDFVector[0];
     bdf1 = BDFVector[1];
@@ -328,7 +330,7 @@ void CalculateEffectiveViscosityAtGaussPoint()
         }
     }
     DynamicViscosity = dynamic_viscosity / navg;
-    
+
     if (SmagorinskyConstant > 0.0)
     {
         const double strain_rate_norm = ComputeStrainNorm();
diff --git a/applications/FluidDynamicsApplication/custom_utilities/two_fluid_navier_stokes_alpha_method_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h
similarity index 99%
rename from applications/FluidDynamicsApplication/custom_utilities/two_fluid_navier_stokes_alpha_method_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h
index 23ccd912c5d2..dfaf01c1eeb7 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/two_fluid_navier_stokes_alpha_method_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h
@@ -17,7 +17,7 @@
 #include "includes/constitutive_law.h"
 
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 #include "utilities/element_size_calculator.h"
 #include "custom_utilities/fluid_element_utilities.h"
 
@@ -45,6 +45,8 @@ using MatrixRowType = typename FluidElementData<TDim, TNumNodes, true>::MatrixRo
 typedef Geometry<Node> GeometryType;
 typedef GeometryType::ShapeFunctionsGradientsType ShapeFunctionsGradientsType;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{
diff --git a/applications/FluidDynamicsApplication/custom_utilities/weakly_compressible_navier_stokes_data.h b/applications/FluidDynamicsApplication/custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h
similarity index 97%
rename from applications/FluidDynamicsApplication/custom_utilities/weakly_compressible_navier_stokes_data.h
rename to applications/FluidDynamicsApplication/custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h
index 83fb0705c168..e7a8267d7baf 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/weakly_compressible_navier_stokes_data.h
+++ b/applications/FluidDynamicsApplication/custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h
@@ -25,7 +25,7 @@
 
 // Application includes
 #include "fluid_dynamics_application_variables.h"
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 #include "utilities/element_size_calculator.h"
 
 namespace Kratos {
@@ -49,6 +49,8 @@ using NodalVectorData = typename FluidElementData<TDim,TNumNodes, true>::NodalVe
 using ShapeFunctionsType = typename FluidElementData<TDim,TNumNodes, true>::ShapeFunctionsType;
 using MatrixRowType = typename FluidElementData<TDim,TNumNodes, true>::MatrixRowType;
 
+static constexpr std::size_t BlockSize = TDim + 1;
+
 ///@}
 ///@name Public Members
 ///@{
diff --git a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.cpp b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.cpp
index f85d49c80e71..976568d111ff 100644
--- a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.cpp
@@ -4,10 +4,10 @@
 #include "custom_elements/qs_vms.h"
 #include "custom_elements/weakly_compressible_navier_stokes.h"
 
-#include "custom_utilities/embedded_data.h"
+#include "custom_elements/data_containers/embedded_data.h"
 #include "utilities/element_size_calculator.h"
-#include "custom_utilities/time_integrated_qsvms_data.h"
-#include "custom_utilities/weakly_compressible_navier_stokes_data.h"
+#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
+#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"
 
 #include "modified_shape_functions/triangle_2d_3_modified_shape_functions.h"
 #include "modified_shape_functions/tetrahedra_3d_4_modified_shape_functions.h"
diff --git a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.h b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.h
index c738e7909cf0..681a6106bd3e 100644
--- a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.h
+++ b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element.h
@@ -23,7 +23,7 @@
 #include "includes/cfd_variables.h"
 #include "custom_elements/fluid_element.h"
 
-#include "custom_utilities/embedded_data.h"
+#include "custom_elements/data_containers/embedded_data.h"
 
 namespace Kratos
 {
diff --git a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.cpp b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.cpp
index 08262ab8fb70..3b15623136c4 100644
--- a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.cpp
@@ -5,9 +5,9 @@
 #include "custom_elements/weakly_compressible_navier_stokes.h"
 
 #include "utilities/element_size_calculator.h"
-#include "custom_utilities/embedded_discontinuous_data.h"
-#include "custom_utilities/time_integrated_qsvms_data.h"
-#include "custom_utilities/weakly_compressible_navier_stokes_data.h"
+#include "custom_elements/data_containers/embedded_discontinuous_data.h"
+#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
+#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"
 
 #include "modified_shape_functions/triangle_2d_3_modified_shape_functions.h"
 #include "modified_shape_functions/tetrahedra_3d_4_modified_shape_functions.h"
diff --git a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.h b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.h
index 5f8c41f833bd..b8fa3b4d96da 100644
--- a/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.h
+++ b/applications/FluidDynamicsApplication/custom_elements/embedded_fluid_element_discontinuous.h
@@ -23,7 +23,7 @@
 #include "includes/cfd_variables.h"
 #include "custom_elements/fluid_element.h"
 
-#include "custom_utilities/embedded_discontinuous_data.h"
+#include "custom_elements/data_containers/embedded_discontinuous_data.h"
 
 namespace Kratos
 {
diff --git a/applications/FluidDynamicsApplication/custom_elements/fic.cpp b/applications/FluidDynamicsApplication/custom_elements/fic.cpp
index 053c5b609e0c..729f740e357a 100644
--- a/applications/FluidDynamicsApplication/custom_elements/fic.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/fic.cpp
@@ -15,8 +15,8 @@
 #include "includes/cfd_variables.h"
 #include "includes/checks.h"
 
-#include "custom_utilities/fic_data.h"
-#include "custom_utilities/time_integrated_fic_data.h"
+#include "custom_elements/data_containers/fic/fic_data.h"
+#include "custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h"
 #include "custom_utilities/fluid_element_utilities.h"
 #include "utilities/element_size_calculator.h"
 #include "custom_utilities/fluid_element_time_integration_detail.h"
diff --git a/applications/FluidDynamicsApplication/custom_elements/fluid_element.cpp b/applications/FluidDynamicsApplication/custom_elements/fluid_element.cpp
index 8204a2c31a1e..66ec1334e046 100644
--- a/applications/FluidDynamicsApplication/custom_elements/fluid_element.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/fluid_element.cpp
@@ -15,15 +15,15 @@
 #include "includes/checks.h"
 
 #include "data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h"
-#include "custom_utilities/qsvms_data.h"
-#include "custom_utilities/time_integrated_qsvms_data.h"
-#include "custom_utilities/qsvms_dem_coupled_data.h"
-#include "custom_utilities/fic_data.h"
-#include "custom_utilities/time_integrated_fic_data.h"
-#include "custom_utilities/symbolic_stokes_data.h"
-#include "custom_utilities/two_fluid_navier_stokes_data.h"
-#include "custom_utilities/two_fluid_navier_stokes_alpha_method_data.h"
-#include "custom_utilities/weakly_compressible_navier_stokes_data.h"
+#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"
+#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
+#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
+#include "custom_elements/data_containers/fic/fic_data.h"
+#include "custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h"
+#include "custom_elements/data_containers/stokes/stokes_data.h"
+#include "custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h"
+#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"
+#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"
 #include "utilities/element_size_calculator.h"
 #include "custom_utilities/vorticity_utilities.h"
 
diff --git a/applications/FluidDynamicsApplication/custom_elements/fluid_element.h b/applications/FluidDynamicsApplication/custom_elements/fluid_element.h
index ebeaf5396f7d..47c941fb8151 100644
--- a/applications/FluidDynamicsApplication/custom_elements/fluid_element.h
+++ b/applications/FluidDynamicsApplication/custom_elements/fluid_element.h
@@ -21,7 +21,7 @@
 #include "geometries/geometry.h"
 
 #include "includes/cfd_variables.h"
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 #include "fluid_dynamics_application_variables.h"
 
 
@@ -106,7 +106,7 @@ class FluidElement : public Element
 
     static constexpr unsigned int NumNodes = TElementData::NumNodes;
 
-    static constexpr unsigned int BlockSize = Dim + 1;
+    static constexpr unsigned int BlockSize = TElementData::BlockSize;
 
     static constexpr unsigned int LocalSize = NumNodes * BlockSize;
 
diff --git a/applications/FluidDynamicsApplication/custom_elements/qs_vms.cpp b/applications/FluidDynamicsApplication/custom_elements/qs_vms.cpp
index 228f179dda98..c18ba4c6e1b9 100644
--- a/applications/FluidDynamicsApplication/custom_elements/qs_vms.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/qs_vms.cpp
@@ -14,9 +14,9 @@
 #include "includes/cfd_variables.h"
 #include "includes/checks.h"
 
-#include "custom_utilities/qsvms_data.h"
-#include "custom_utilities/time_integrated_qsvms_data.h"
-#include "custom_utilities/qsvms_dem_coupled_data.h"
+#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"
+#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
+#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
 #include "custom_utilities/fluid_element_utilities.h"
 #include "custom_utilities/fluid_element_time_integration_detail.h"
 
diff --git a/applications/FluidDynamicsApplication/custom_elements/qs_vms_dem_coupled.cpp b/applications/FluidDynamicsApplication/custom_elements/qs_vms_dem_coupled.cpp
index 51431713f28c..020ef6d5f283 100644
--- a/applications/FluidDynamicsApplication/custom_elements/qs_vms_dem_coupled.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/qs_vms_dem_coupled.cpp
@@ -17,7 +17,7 @@
 
 // Aplication includes
 #include "qs_vms_dem_coupled.h"
-#include "custom_utilities/qsvms_dem_coupled_data.h"
+#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
 #include "custom_utilities/fluid_element_utilities.h"
 #include "fluid_dynamics_application_variables.h"
 
diff --git a/applications/FluidDynamicsApplication/custom_elements/symbolic_stokes.cpp b/applications/FluidDynamicsApplication/custom_elements/symbolic_stokes.cpp
index 3b5328d742c7..543c9f2bf981 100644
--- a/applications/FluidDynamicsApplication/custom_elements/symbolic_stokes.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/symbolic_stokes.cpp
@@ -18,7 +18,7 @@
 
 // Application includes
 #include "symbolic_stokes.h"
-#include "custom_utilities/symbolic_stokes_data.h"
+#include "custom_elements/data_containers/stokes/stokes_data.h"
 #include "custom_utilities/fluid_element_utilities.h"
 
 namespace Kratos
diff --git a/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes.cpp b/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes.cpp
index c2bcf1934c0b..8f0173662051 100644
--- a/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes.cpp
@@ -12,8 +12,8 @@
 //
 
 #include "two_fluid_navier_stokes.h"
-#include "custom_utilities/two_fluid_navier_stokes_data.h"
-#include "custom_utilities/two_fluid_navier_stokes_alpha_method_data.h"
+#include "custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h"
+#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"
 
 namespace Kratos
 {
diff --git a/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes_alpha_method.cpp b/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes_alpha_method.cpp
index b36cea0a6ec8..5e21ddaaeb6a 100644
--- a/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes_alpha_method.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/two_fluid_navier_stokes_alpha_method.cpp
@@ -12,7 +12,7 @@
 //
 
 #include "two_fluid_navier_stokes_alpha_method.h"
-#include "custom_utilities/two_fluid_navier_stokes_alpha_method_data.h"
+#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"
 
 namespace Kratos
 {
diff --git a/applications/FluidDynamicsApplication/custom_elements/weakly_compressible_navier_stokes.cpp b/applications/FluidDynamicsApplication/custom_elements/weakly_compressible_navier_stokes.cpp
index 73d806db63b5..e6664c4cdfb5 100644
--- a/applications/FluidDynamicsApplication/custom_elements/weakly_compressible_navier_stokes.cpp
+++ b/applications/FluidDynamicsApplication/custom_elements/weakly_compressible_navier_stokes.cpp
@@ -21,7 +21,7 @@
 
 // Application includes
 #include "weakly_compressible_navier_stokes.h"
-#include "custom_utilities/weakly_compressible_navier_stokes_data.h"
+#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"
 
 namespace Kratos
 {
diff --git a/applications/FluidDynamicsApplication/custom_utilities/fluid_element_utilities.h b/applications/FluidDynamicsApplication/custom_utilities/fluid_element_utilities.h
index 4064ed85f649..6390e73ace9b 100644
--- a/applications/FluidDynamicsApplication/custom_utilities/fluid_element_utilities.h
+++ b/applications/FluidDynamicsApplication/custom_utilities/fluid_element_utilities.h
@@ -20,7 +20,7 @@
 #include "includes/define.h"
 
 // Application includes
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 
 
 namespace Kratos
diff --git a/applications/FluidDynamicsApplication/fluid_dynamics_application.h b/applications/FluidDynamicsApplication/fluid_dynamics_application.h
index 666272653238..4c6a696d9a7a 100644
--- a/applications/FluidDynamicsApplication/fluid_dynamics_application.h
+++ b/applications/FluidDynamicsApplication/fluid_dynamics_application.h
@@ -82,15 +82,15 @@
 #include "custom_elements/two_fluid_navier_stokes_alpha_method.h"
 
 #include "custom_elements/data_containers/axisymmetric_navier_stokes/axisymmetric_navier_stokes_data.h"
-#include "custom_utilities/qsvms_data.h"
-#include "custom_utilities/time_integrated_qsvms_data.h"
-#include "custom_utilities/qsvms_dem_coupled_data.h"
-#include "custom_utilities/fic_data.h"
-#include "custom_utilities/time_integrated_fic_data.h"
-#include "custom_utilities/symbolic_stokes_data.h"
-#include "custom_utilities/two_fluid_navier_stokes_data.h"
-#include "custom_utilities/two_fluid_navier_stokes_alpha_method_data.h"
-#include "custom_utilities/weakly_compressible_navier_stokes_data.h"
+#include "custom_elements/data_containers/qs_vms/qs_vms_data.h"
+#include "custom_elements/data_containers/time_integrated_qs_vms/time_integrated_qs_vms_data.h"
+#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
+#include "custom_elements/data_containers/fic/fic_data.h"
+#include "custom_elements/data_containers/time_integrated_fic/time_integrated_fic_data.h"
+#include "custom_elements/data_containers/stokes/stokes_data.h"
+#include "custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h"
+#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"
+#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"
 
 #include "custom_constitutive/bingham_3d_law.h"
 #include "custom_constitutive/euler_2d_law.h"
diff --git a/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/symbolic_stokes_cpp_template.cpp b/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/symbolic_stokes_cpp_template.cpp
index e639dda48e7f..38bf0d67aa28 100644
--- a/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/symbolic_stokes_cpp_template.cpp
+++ b/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/symbolic_stokes_cpp_template.cpp
@@ -18,7 +18,7 @@
 
 // Application includes
 #include "symbolic_stokes.h"
-#include "custom_utilities/symbolic_stokes_data.h"
+#include "custom_elements/data_containers/stokes/stokes_data.h"
 #include "custom_utilities/fluid_element_utilities.h"
 
 namespace Kratos
diff --git a/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_cpp_template.cpp b/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_cpp_template.cpp
index 56284066c345..a5c19b56a5aa 100644
--- a/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_cpp_template.cpp
+++ b/applications/FluidDynamicsApplication/python_scripts/symbolic_generation/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_cpp_template.cpp
@@ -21,7 +21,7 @@
 
 // Application includes
 #include "weakly_compressible_navier_stokes.h"
-#include "custom_utilities/weakly_compressible_navier_stokes_data.h"
+#include "custom_elements/data_containers/weakly_compressible_navier_stokes/weakly_compressible_navier_stokes_data.h"
 
 namespace Kratos
 {
diff --git a/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_alpha_method_template.cpp b/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_alpha_method_template.cpp
index d70c2ebfbdc6..5b41e03ed768 100644
--- a/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_alpha_method_template.cpp
+++ b/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_alpha_method_template.cpp
@@ -12,7 +12,7 @@
 //
 
 #include "two_fluid_navier_stokes_alpha_method.h"
-#include "custom_utilities/two_fluid_navier_stokes_alpha_method_data.h"
+#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"
 
 namespace Kratos
 {
@@ -112,7 +112,7 @@ void TwoFluidNavierStokesAlphaMethod<TElementData>::Calculate(
     ShapeFunctionDerivativesArrayType shape_derivatives;
     this->CalculateGeometryData(gauss_weights, shape_functions, shape_derivatives);
     const unsigned int number_of_gauss_points = gauss_weights.size();
-    rOutput = 0.0; 
+    rOutput = 0.0;
     if (rVariable == ARTIFICIAL_DYNAMIC_VISCOSITY)
     {
 
diff --git a/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_template.cpp b/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_template.cpp
index dd6b07780173..76de5936d085 100644
--- a/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_template.cpp
+++ b/applications/FluidDynamicsApplication/symbolic_generation/two_fluid_navier_stokes/two_fluid_navier_stokes_template.cpp
@@ -12,8 +12,8 @@
 //
 
 #include "two_fluid_navier_stokes.h"
-#include "custom_utilities/two_fluid_navier_stokes_data.h"
-#include "custom_utilities/two_fluid_navier_stokes_alpha_method_data.h"
+#include "custom_elements/data_containers/two_fluid_navier_stokes/two_fluid_navier_stokes_data.h"
+#include "custom_elements/data_containers/two_fluid_navier_stokes_alpha_method/two_fluid_navier_stokes_alpha_method_data.h"
 
 namespace Kratos
 {
diff --git a/applications/FluidDynamicsApplication/tests/cpp_tests/test_alternative_qs_vms_dem_coupled_element.cpp b/applications/FluidDynamicsApplication/tests/cpp_tests/test_alternative_qs_vms_dem_coupled_element.cpp
index b91803f583ad..67a48f24eafa 100644
--- a/applications/FluidDynamicsApplication/tests/cpp_tests/test_alternative_qs_vms_dem_coupled_element.cpp
+++ b/applications/FluidDynamicsApplication/tests/cpp_tests/test_alternative_qs_vms_dem_coupled_element.cpp
@@ -21,7 +21,7 @@
 // Application includes
 #include "custom_constitutive/newtonian_2d_law.h"
 #include "custom_elements/alternative_qs_vms_dem_coupled.h"
-#include "custom_utilities/qsvms_dem_coupled_data.h"
+#include "custom_elements/data_containers/qs_vms_dem_coupled/qs_vms_dem_coupled_data.h"
 #include "tests/cpp_tests/fluid_dynamics_fast_suite.h"
 
 namespace Kratos {
diff --git a/applications/FluidDynamicsApplication/tests/cpp_tests/test_fluid_element_data.cpp b/applications/FluidDynamicsApplication/tests/cpp_tests/test_fluid_element_data.cpp
index c055ecee6b49..b1b6439bde71 100644
--- a/applications/FluidDynamicsApplication/tests/cpp_tests/test_fluid_element_data.cpp
+++ b/applications/FluidDynamicsApplication/tests/cpp_tests/test_fluid_element_data.cpp
@@ -19,7 +19,7 @@
 #include "includes/cfd_variables.h"
 
 // Application includes
-#include "custom_utilities/fluid_element_data.h"
+#include "custom_elements/data_containers/fluid_element_data.h"
 #include "tests/cpp_tests/fluid_dynamics_fast_suite.h"
 
 namespace Kratos {