no more builders
use java 1.7
restore QueryController usage
new dino design with tests