Removing deps on old DataGenerator files
Refactoring into packages