Cleanup: Create hierarchical object for VPI structures