Extractor & SangerUniversal applications refactoring