Moved code to core assembly

in preparation for online version!
Upgraded JSON.net version