Refactor `client` bundler.