Reorganize includes<> and change some variable names
Restructure QGTagger_cfi