[S2FS] Merge DataGrid, Repository into CoreBundle