Fixed a typo.
Moved a lot of things.