Reorganization to clarify dependencies

I think we can drop it, as well as the `Scheme`s below; I think we only needed it back in HoTT/coq.  But I'm not completely sure, so we should check this.