Combined into Visual Studio friendly solution