Restructuring the repo