Reorganize some files.  Working on talk...