More structural changes to the repo.