Reorganize `section` and `thread` blocks.