Revert "Move recovery files to common"

This reverts commit bb29922350de47434780dcf0d68b53d32b32af37.