Reorganize parts