Moved the solution file

The solution file shuold be in the root directory so we can have a
single NuGet.exe file.  Also supports eventually adding a test directory
for the project
Minor refactoring of logic