Revert back to old page structure.
Rename include files.
Clean up header.