Fix up, move to a submodule