beamAnalyzer reorganized