Rework internal structure