Fixed merge issue.  Before wrong folder was being used. Integrity of solutions re verified
Added other needed files