Rearranged the WebWallet definitions