Merge "Restructure of devtools folder for pairwise tests"