Rework controller structure