Moving files around to make more sense.