Move bow-restore to a separate package