Optimize client module dependencies.
Finish refactoring-client-dependecies