Major page reorganization finished

For now, the major reshuffling of pages is a wrap. There will be many more changes in the future, I'm sure, but the basic structure is pretty much the way we want it for now.