refactor solvable factory and query execution; groundwork for plugins