Lots of updates, renaming, and cleaning up into directories.