Converting files for publish

More renaming, alignment, and comments