And yes, the Point struct shall be removed, too