add coverage
reorganize pages