Move account and utilities to main client