Moved Grid and Painter to core package, + misc