Align directories closer to maven standard

:q!
A few more mild import changes
Merge branch 'master' of github.com:0xdata/h2o