added vocabulary, renamed files