A smaller version than the original remove ivory-data PR.

Did you see me note on the other PR, I am not a fan, but nor am I fan of having case classes defined inline here, they should be top level with companions IMO. Just trying to maintain the status quo with this one though.