reorganize nicer and more like existing code

Sep 16 10:08 +00:00

5m24s

*Variants labelled (experimental) are still undergoing testing; if they have failed it may be a bug in OCaml-CI.