moving analyzer to a separate module
fix merge