major reorganization of repo