hydro-devel doesn't exist in my repository, switching back to master bra...

...nch

* Re-ordered the tree!
* Replaced hydro-devel with master