Fixed some spacing.
Fixed a file name.
Did some reorganizing.