Change the structure remove visual studio solution files and keep the structure simple