Folder structure cleaning
Solution file changed with new folder strucure