Refactor folder structure for smoke test that uses query params (#5708)

Refactor folder structure for smoke test that uses query params (#5708) #10336