Restructuring repo structure