refactor solution
fix tests fsproj
fix json.net dependency issue