HATCH: refactoring and reordering (WIP).

Signed-off-by: bert <bert.timmerman@xs4all.nl>