Jump works for both directions
Refactor classes into dedicated files