Changed folder structure to separate between visual studio versions
Merge branch 'changed-folder-structure' into development