Toolset directory reorganization
Merge pull request #460 from fernandoacorreia/toolset-reorganization

Toolset directory reorganization