Modify title display in html output.
Rename files more cohernetly.