Merge dgen and dgen driver into a single project.
Simplify some things.