move WalletId to its own file