Major reorganization of repo.