refactor marc extractor
move MarcExtractor to it's own file, new name