Use updated filesystem layout for backup too