Reorganized the headers declarations in every file
Added a NON_FUNCTIONAL_YET ModelCalibrationCell