Reorganize vocabulary