Restructured advection and diffusion files