props: Reorganization