Whitespace changes
Move Chih's new filenames back to their original filenames

(So that we can see the diffs)
Rename 2d html file slightly