change solution structure to make it easy to create msbuild file