Moved vector navigation methods into shapes
(cherry picked from commit ce4f81f986b199f66d4e42a8b058e49e5b8f91e6)