Reorganize some files.