Restructured with new item/pipe/element hierarchy.