Reorder code.
Merge branch 'master' of https://github.com/h2oai/h2o-dev