removed unnecesary headers, cleaned up integrator class structure