Refactor WaveAnalysis by moving base calsses to WaveAnalysisCommon