Move more files from CVS repos; cleanup.