moved data generators to different package
removed old generator classes