reorganize nicer and more like existing code

Aug 06 08:42 +00:00

1m38s

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