Reorganize some files