Move Rect and Point back into Rect module