Cleanup

General cleanup. It's easiest to review each change individually, since there are several whitespace-only and file naming commits that muddy the overall combined diff.