Reorganize recovery module