Move hooks sections together

Same change from 0.7 made on dev