Toolset directory reorganization
Merge branch 'toolset-reorganization' into facorreia/azure
Toolset directory reorganization
Merge branch 'toolset-reorganization' into facorreia/azure