Some better modularization of page generation.
Renamed module.