Move vocab out to a single package