Grids moved to API, separator infrastructure