Xcode Sort

I'm just sorting the files in Xcode into alphabetical order.
Cleanup

I just went through and re-indented all the files.  If this bothers you
I'm sorry and you can revert, I just figured it might be nice for the
sake of readability.