Lots of structural changes in repo.