Reorganize, add section headers