minor UPD
core lib split
core lib split
JSON parser restructuring