Modify for new format.

Simplify part structure to allow parts to be standalone.