Rework architecture