re-orginize into QueryProcessor/ and DataGenerator/
Re-organize files