Main change is addition of Integrator file, and restructing to
accomodate the new Integrator class. Have not yet implemented it.
Some minor refactoring done as well.