Restructuring of repo