Use correct path
Basic pages
Add missing hooks
Fix hook
Move to utils