changes in cc-wallet-core structure