AnalysisForm: Add another file
AnalysisForm: Name change
AnalysisForm: removal of unecessary forms