Move geometry stuff in geometry.rs