reorganize the generated parts