Move extractor classes to folder