Gizmo path refactor