T2663
Wallet state is disorganized due to iterative changes and preservation of artifacts. This stack will better organize how wallet information is stored and ensure legacy wallets are properly migrated.
In part one, nothing is changed -- we just add the desired end state which future diffs will work toward.