datagen refactoring
5 files changed