Moving to a flat format