Moved a few files around so it makes more sense.