Flattened manifest/queries

- Created a manifest with only root level entries. 
- Adjusted queries using new naming scheme.

- Tested by changing the manifest used to generator.rb (I changed it back though to what it was originally) and data generation/queries worked great.