move some classes to analysis.jsx