Refactoring of AnalysisEngine into component objects