Moved feature extractor in a better named folder.
Remove useless non-understandable commented out code.