Move extractors to subpackage
Remove 'Extractor' suffix, fix examples