Refractored analysis objects into multiple classes.