Consolidate some files.