update, update with query template and benchmarks added
shallow substituted by stage, clean ups, folder restructuring.