Rearrange solution structure; add Newtonsoft.Json nuget reference and remove static reference; make minor code refactors as a first pass.