Restructured repo