Move to proper extractor package