Navigation reorganization based on discussion

Still some work to be done, need index pages, and content, but most info is there.