Moved files around so they make more sense.