- SDM: Moved DescriptorExtractors to a separate file

- minor changes