Some reshuffling to make LH5 support standard.

So I've made some rearrangements so that we don't have to import compatibility.  Let me know if this is the best way to do this...