diff --git a/contracts/interfaces/ip-accounts/IERC6551Account.sol b/mvp/contracts/interfaces/ip-accounts/IERC6551Account.sol
similarity index 100%
rename from contracts/interfaces/ip-accounts/IERC6551Account.sol
rename to mvp/contracts/interfaces/ip-accounts/IERC6551Account.sol
diff --git a/contracts/interfaces/ip-accounts/IIPAccount.sol b/mvp/contracts/interfaces/ip-accounts/IIPAccount.sol
similarity index 100%
rename from contracts/interfaces/ip-accounts/IIPAccount.sol
rename to mvp/contracts/interfaces/ip-accounts/IIPAccount.sol
diff --git a/contracts/interfaces/ip-accounts/IIPAccountRegistry.sol b/mvp/contracts/interfaces/ip-accounts/IIPAccountRegistry.sol
similarity index 100%
rename from contracts/interfaces/ip-accounts/IIPAccountRegistry.sol
rename to mvp/contracts/interfaces/ip-accounts/IIPAccountRegistry.sol
diff --git a/contracts/interfaces/modules/collect/ICollectModule.sol b/mvp/contracts/interfaces/modules/collect/ICollectModule.sol
similarity index 100%
rename from contracts/interfaces/modules/collect/ICollectModule.sol
rename to mvp/contracts/interfaces/modules/collect/ICollectModule.sol
diff --git a/contracts/interfaces/modules/collect/ICollectNFT.sol b/mvp/contracts/interfaces/modules/collect/ICollectNFT.sol
similarity index 100%
rename from contracts/interfaces/modules/collect/ICollectNFT.sol
rename to mvp/contracts/interfaces/modules/collect/ICollectNFT.sol
diff --git a/contracts/interfaces/modules/collect/ICollectPaymentModule.sol b/mvp/contracts/interfaces/modules/collect/ICollectPaymentModule.sol
similarity index 100%
rename from contracts/interfaces/modules/collect/ICollectPaymentModule.sol
rename to mvp/contracts/interfaces/modules/collect/ICollectPaymentModule.sol
diff --git a/contracts/interfaces/modules/royalties/IRoyaltyDistributor.sol b/mvp/contracts/interfaces/modules/royalties/IRoyaltyDistributor.sol
similarity index 100%
rename from contracts/interfaces/modules/royalties/IRoyaltyDistributor.sol
rename to mvp/contracts/interfaces/modules/royalties/IRoyaltyDistributor.sol
diff --git a/contracts/interfaces/modules/royalties/IRoyaltyPolicy.sol b/mvp/contracts/interfaces/modules/royalties/IRoyaltyPolicy.sol
similarity index 100%
rename from contracts/interfaces/modules/royalties/IRoyaltyPolicy.sol
rename to mvp/contracts/interfaces/modules/royalties/IRoyaltyPolicy.sol
diff --git a/contracts/interfaces/modules/royalties/ISplitMain.sol b/mvp/contracts/interfaces/modules/royalties/ISplitMain.sol
similarity index 100%
rename from contracts/interfaces/modules/royalties/ISplitMain.sol
rename to mvp/contracts/interfaces/modules/royalties/ISplitMain.sol
diff --git a/contracts/interfaces/modules/royalties/policies/IRoyaltyPolicy.sol b/mvp/contracts/interfaces/modules/royalties/policies/IRoyaltyPolicy.sol
similarity index 100%
rename from contracts/interfaces/modules/royalties/policies/IRoyaltyPolicy.sol
rename to mvp/contracts/interfaces/modules/royalties/policies/IRoyaltyPolicy.sol
diff --git a/mvp/test/foundry/RoyaltyDistributor.t.sol b/mvp/test/foundry/RoyaltyDistributor.t.sol
index abcb4dbb..988dc9e0 100644
--- a/mvp/test/foundry/RoyaltyDistributor.t.sol
+++ b/mvp/test/foundry/RoyaltyDistributor.t.sol
@@ -10,7 +10,7 @@ import "contracts/modules/royalties/RoyaltyNFT.sol";
 import "contracts/interfaces/modules/royalties/ISplitMain.sol";
 import "./mocks/MockSplitMain.sol";
 import "./mocks/MockERC20.sol";
-import "test/foundry/mocks/MockSplitMain.sol";
+import "./mocks/MockSplitMain.sol";
 import "contracts/modules/royalties/policies/MutableRoyaltyProportionPolicy.sol";
 import "contracts/modules/royalties/RoyaltyNFTFactory.sol";
 
diff --git a/test/foundry/mocks/MockSplit.sol b/mvp/test/foundry/mocks/MockSplit.sol
similarity index 100%
rename from test/foundry/mocks/MockSplit.sol
rename to mvp/test/foundry/mocks/MockSplit.sol
diff --git a/test/foundry/mocks/MockSplitMain.sol b/mvp/test/foundry/mocks/MockSplitMain.sol
similarity index 98%
rename from test/foundry/mocks/MockSplitMain.sol
rename to mvp/test/foundry/mocks/MockSplitMain.sol
index 01c0024a..cab2a752 100644
--- a/test/foundry/mocks/MockSplitMain.sol
+++ b/mvp/test/foundry/mocks/MockSplitMain.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.13;
 
 import "contracts/interfaces/modules/royalties/ISplitMain.sol";
-import "test/foundry/mocks/MockSplit.sol";
+import "./MockSplit.sol";
 import "test/foundry/mocks/MockERC20.sol";
 
 contract MockSplitMain is ISplitMain {
diff --git a/test/foundry/e2e/e2e.t.sol b/test/foundry/e2e/e2e.t.sol
index e4fc0f7a..6517cde1 100644
--- a/test/foundry/e2e/e2e.t.sol
+++ b/test/foundry/e2e/e2e.t.sol
@@ -213,8 +213,8 @@ contract E2ETest is BaseTest {
             memory registerIpAssetParamsCharacter = Registration
                 .RegisterIPAssetParams({
                     owner: ipAssetOwner1,
+                    ipOrgAssetType: 0,
                     name: "Character IPA",
-                    ipAssetType: 0,
                     hash: 0x558b44f88e5959cec9c7836078a53ff4d6432142a9d5caa6f3a6eb7c83930000,
                     mediaUrl: "https://arweave.net/chracter"
                 });
@@ -236,8 +236,8 @@ contract E2ETest is BaseTest {
             memory registerIpAssetParamsStory = Registration
                 .RegisterIPAssetParams({
                     owner: ipAssetOwner2,
+                    ipOrgAssetType: 1,
                     name: "Story IPA",
-                    ipAssetType: 1,
                     hash: 0x558b44f88e5959cec9c7836078a53ff4d6432142a9d5caa6f3a6eb7c83931111,
                     mediaUrl: "https://arweave.net/story"
                 });
@@ -260,8 +260,8 @@ contract E2ETest is BaseTest {
             memory registerIpAssetParamsOrg2 = Registration
                 .RegisterIPAssetParams({
                     owner: ipAssetOwner3,
+                    ipOrgAssetType: 1,
                     name: "Story IPA Org2",
-                    ipAssetType: 1,
                     hash: 0x558b44f88e5959cec9c7836078a53ff4d6432142a9d5caa6f3a6eb7c83933333,
                     mediaUrl: "https://arweave.net/story2"
                 });
@@ -282,10 +282,8 @@ contract E2ETest is BaseTest {
                 relType: "APPEAR_IN",
                 srcAddress: ipOrg1,
                 srcId: 1,
-                srcType: 0,
                 dstAddress: ipOrg1,
-                dstId: 2,
-                dstType: 0
+                dstId: 2
             });
         bytes[] memory preHooksDataRel = new bytes[](0);
         bytes[] memory postHooksDataRel = new bytes[](0);
diff --git a/test/foundry/utils/BaseTest.sol b/test/foundry/utils/BaseTest.sol
index a810e55f..d81d5e6b 100644
--- a/test/foundry/utils/BaseTest.sol
+++ b/test/foundry/utils/BaseTest.sol
@@ -12,7 +12,6 @@ import "contracts/IPAssetRegistry.sol";
 import "contracts/lib/modules/Registration.sol";
 import "contracts/access-control/AccessControlSingleton.sol";
 import "contracts/IPAssetRegistry.sol";
-import "contracts/interfaces/modules/collect/ICollectModule.sol";
 import "contracts/modules/relationships/RelationshipModule.sol";
 import "contracts/modules/licensing/LicenseRegistry.sol";
 import "contracts/modules/licensing/LicensingModule.sol";
@@ -29,7 +28,6 @@ contract BaseTest is BaseTestUtils, ProxyHelper, AccessControlHelper {
     IPOrg public ipOrg;
     IPOrgController public ipOrgController;
     ModuleRegistry public moduleRegistry;
-    ICollectModule public collectModule;
     RelationshipModule public relationshipModule;
     IPAssetRegistry public registry;
     StoryProtocol public spg;