bug fix and refactoring

moved vocabularies to separate package
fixed machine readable form bug
added recur infinite times variable to model
fixed price presence checking to include only price limits