rework architecture