Moving decomposition methods to FormulaDecomposer