Adding support for ClientBundle generator.
Genericised the names of generators.

Still need to refactor the inheritance hierarchy of the generator
factories.