Fix hume for new filesystem structure.
More adjustments to top level interfaces.