[client] Improve the independency of modules.