Split apart the diffusivity file and added models for porous media