Restructure the hook points.