moving sln to top
fixing up solution struture