Reorganized some of the files.