Added CriteriaBuilder and OptionBuilder classes.
Moved criteria builders into their own classes.
Update documentation.