Main: added option to stop after scoping. Tests: moved/renamed/created.