reorganize nicer and more like existing code

Aug 27 21:08 +00:00

1m44s

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