Updates to use XDT from NuGet. Resolved #44. Also cleaned up some code #38