Put advection classes into new format
Put forward declarations in model header to reduce the compilation
times and put cross section class into the correct format