Revert "Revert "Backup before refactoring""

This reverts commit 66d354721898710821e483191887c7b5d9e3cc3c.