Add vocabid, tests, and start separating headers