Reorganize files for handover