Collapse submodule back into main repo