Update to use split repo structure