Reorganized server-side layout
Small, incremental progress towards client-side clean-up