Remove grid package, update Cell with Tile