Reorganize and begin the implementation of an integrator factory