move baton to separate file