Reorganize some folders
Merge branch 'master' of https://github.com/patrickherrmann/vs