Rearranged into support project.
Made AnalysisContext immutable
Sonar suggestions