fluid solver rewrite, package hierarchy changes