Moving fluid related code to Fluid module. Workstation will depend on it.