Restructure Solution file