Discuss if this is the desired layout
Depends on D4302
Do a cmake build in the Tools Directory
I've applied these changes across the other diffs, closing