move refs to fluid structures