Refactor the client modules bundler.