Continued refactoring, begun rewriting of new JsonLd format