Synch to latest version

Changed file locations, changed include files from .inc to .xhtml so you
could next includes. Created nav structure.