Change project structure + change visibility of QueryBuilder constructor