Code reorganization

Also added vapor diffusivity equations