moved rewriting of queries to construct to helper file
renamed file for better coherence
fixed calc of precision and recall
just some fixes I forgot to commit ;)