Reorganized server-side structure