Change to some logic on the deletion of empty folders