Some reorg again. Also implemented Box as a GeometryObject.