Optimize structure of object

As discussed, we should optimize the structure of what GRaNPA returns. We could either discuss this here or elsewhere, I am fin with both.