Everything is now in one solution, except for the Test Game.
Building should be easier.