refactoring no more modules on wallets. just on one wallet at a time