Restructuring to resolved nested repositories