Extend re arch

Changes for latest approach and example cleanup.