Moved a couple files around, tweaked a few comments.