Re-org entry/vocab