Move Grid classes to new package