Minor clean up
Let exec take a Scenario, close #1145
Move JdbcDataWriter to proper module, fix counters