Re-org of pages and index