Merge branch 'Restructuring' of https://github.com/mhoopmann/mstoolki… · mhoopmann/mstoolkit@ffe9af0