Reformat
Re-reformat
Removed Info File
More renaming
Some configuration refactor