fix cwallet package structure