Refactoring a little, movig IBO stuff into structs

This lets us keep some of the cell specific pieces together more
easily, as we cover more cell types it should be easier to track.

Change-Id: Idea185c20620a2d0d3dfe454b6529eba4b0b99d4