move extractor modules to subdir