Sort work re-organizing this repository
Shift back to using setoids, but there is work to be done