Refactoring, moving model package to extractor.
Adding FileNameExtractor.: