Added extractor subpackage