Canvas: split Grid and Cell into separate modules