Reorganized some files to make more sense.