I started to do this, and ran into some typing issues calling the DataGenerators from java - will see if I can work around those - I agree it makes sense to have this all in one place.