refactor, start tpch benchmark