Fixed solution structure, added NuGet restore