Renamed Point1 and Rect1 structs