Add Shape and Rectangle classes