some restructuring -- split the low Mach solver in 2