Refactor collectors of bundled files in the client bundler.