Reorganization of Hooks.