JSON Refactor - move EJson into text.json package