Reworking, stripping down to the essentials, will move out of submodule soon.