change to new arch

Author: 1kresh

remappings.txt

@@ -1,6 +1,6 @@
 forge-std/=lib/forge-std/src/
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
 @openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
-@symbiotic/contracts/=lib/core-private/src/contracts/
-@symbiotic/interfaces/=lib/core-private/src/interfaces/
-@symbiotic/mocks/=lib/core-private/test/mocks/
+@symbiotic/contracts/=lib/core/src/contracts/
+@symbiotic/interfaces/=lib/core/src/interfaces/
+@symbiotic/mocks/=lib/core/test/mocks/

src/contracts/defaultOperatorRewards/DefaultOperatorRewards.sol

@@ -2,8 +2,8 @@
 pragma solidity 0.8.25;
 
 import {IDefaultOperatorRewards} from "src/interfaces/defaultOperatorRewards/IDefaultOperatorRewards.sol";
-import {INetworkMiddlewareService} from "@symbiotic/interfaces/INetworkMiddlewareService.sol";
-import {IRegistry} from "@symbiotic/interfaces/base/IRegistry.sol";
+import {INetworkMiddlewareService} from "@symbiotic/interfaces/service/INetworkMiddlewareService.sol";
+import {IRegistry} from "@symbiotic/interfaces/common/IRegistry.sol";
 
 import {SafeERC20, IERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {MerkleProof} from "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";

src/contracts/defaultOperatorRewards/DefaultOperatorRewardsFactory.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.25;
 
 import {DefaultOperatorRewards} from "./DefaultOperatorRewards.sol";
-import {Registry} from "@symbiotic/contracts/base/Registry.sol";
+import {Registry} from "@symbiotic/contracts/common/Registry.sol";
 
 import {IDefaultOperatorRewardsFactory} from "src/interfaces/defaultOperatorRewards/IDefaultOperatorRewardsFactory.sol";
 

src/contracts/defaultStakerRewards/DefaultStakerRewards.sol

@@ -2,10 +2,10 @@
 pragma solidity 0.8.25;
 
 import {IDefaultStakerRewards} from "src/interfaces/defaultStakerRewards/IDefaultStakerRewards.sol";
-import {INetworkMiddlewareService} from "@symbiotic/interfaces/INetworkMiddlewareService.sol";
-import {IRegistry} from "@symbiotic/interfaces/base/IRegistry.sol";
+import {INetworkMiddlewareService} from "@symbiotic/interfaces/service/INetworkMiddlewareService.sol";
+import {IRegistry} from "@symbiotic/interfaces/common/IRegistry.sol";
 import {IStakerRewards} from "src/interfaces/stakerRewards/IStakerRewards.sol";
-import {IVault} from "@symbiotic/interfaces/vault/v1/IVault.sol";
+import {IVault} from "@symbiotic/interfaces/vault/IVault.sol";
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";

src/contracts/defaultStakerRewards/DefaultStakerRewardsFactory.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.25;
 
 import {DefaultStakerRewards} from "./DefaultStakerRewards.sol";
-import {Registry} from "@symbiotic/contracts/base/Registry.sol";
+import {Registry} from "@symbiotic/contracts/common/Registry.sol";
 
 import {IDefaultStakerRewardsFactory} from "src/interfaces/defaultStakerRewards/IDefaultStakerRewardsFactory.sol";