Sync repo structure with the generator-lib structure.
Get tests and build running again.