Refactor as hydro package