Reorganize by props first.