Client-side restructuring