Reorganize by sections