Move TYPES and App back into RDFExtractor