Fixed Solution Layout & Nuget Packager
Merge commit '452a3b21b0c3469e85ae054eaf084e238c062535'