Query Engine Adjusment and Folders Reorder
Revert "Query Engine Adjusment and Folders Reorder"

This reverts commit 4521ba878d8596c7f6ebda7a0487ce90c6f13719.
Merge remote-tracking branch 'origin/master'