Moved vocabulary to its own module.