Restructured the generation of ecpp pages for less redundancy