Refactors IntervalManager into two classes
Refs #6