diff --git a/contracts/LSP6KeyManager/LSP6KeyManagerCore.sol b/contracts/LSP6KeyManager/LSP6KeyManagerCore.sol
index 35be8f4e4..612d29fa2 100644
--- a/contracts/LSP6KeyManager/LSP6KeyManagerCore.sol
+++ b/contracts/LSP6KeyManager/LSP6KeyManagerCore.sol
@@ -15,7 +15,7 @@ import {
 } from "../LSP20CallVerification/ILSP20CallVerifier.sol";
 import {
     ILSP25ExecuteRelayCall as ILSP25
-} from "../../packages/LSP25ExecuteRelayCall/contracts/ILSP25ExecuteRelayCall.sol";
+lsp25/contracts/ILSP25ExecuteRelayCall.sol";
 
 // modules
 import {ILSP14Ownable2Step} from "../LSP14Ownable2Step/ILSP14Ownable2Step.sol";
@@ -29,7 +29,7 @@ import {
 import {LSP6OwnershipModule} from "./LSP6Modules/LSP6OwnershipModule.sol";
 import {
     LSP25MultiChannelNonce
-} from "../../packages/LSP25ExecuteRelayCall/contracts/LSP25MultiChannelNonce.sol";
+lsp25/contracts/LSP25MultiChannelNonce.sol";
 
 // libraries
 import {BytesLib} from "solidity-bytes-utils/contracts/BytesLib.sol";
@@ -71,7 +71,7 @@ import {
 } from "../LSP20CallVerification/LSP20Constants.sol";
 import {
     _INTERFACEID_LSP25
-} from "../../packages/LSP25ExecuteRelayCall/contracts/LSP25Constants.sol";
+lsp25/contracts/LSP25Constants.sol";
 
 /**
  * @title Core implementation of the LSP6 Key Manager standard.
diff --git a/contracts/Mocks/ERC165Interfaces.sol b/contracts/Mocks/ERC165Interfaces.sol
index 10dedeee8..68c06b087 100644
--- a/contracts/Mocks/ERC165Interfaces.sol
+++ b/contracts/Mocks/ERC165Interfaces.sol
@@ -57,7 +57,7 @@ import {
 } from "../LSP20CallVerification/ILSP20CallVerifier.sol";
 import {
     ILSP25ExecuteRelayCall as ILSP25
-} from "../../packages/LSP25ExecuteRelayCall/contracts/ILSP25ExecuteRelayCall.sol";
+lsp25/contracts/ILSP25ExecuteRelayCall.sol";
 
 // constants
 import {_INTERFACEID_LSP0} from "../LSP0ERC725Account/LSP0Constants.sol";
@@ -85,7 +85,7 @@ import {
 } from "../LSP20CallVerification/LSP20Constants.sol";
 import {
     _INTERFACEID_LSP25
-} from "../../packages/LSP25ExecuteRelayCall/contracts/LSP25Constants.sol";
+lsp25/contracts/LSP25Constants.sol";
 
 // libraries
 import {
diff --git a/contracts/Mocks/Reentrancy/BatchReentrancyRelayer.sol b/contracts/Mocks/Reentrancy/BatchReentrancyRelayer.sol
index dec309bbf..b5e5a2627 100644
--- a/contracts/Mocks/Reentrancy/BatchReentrancyRelayer.sol
+++ b/contracts/Mocks/Reentrancy/BatchReentrancyRelayer.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.4;
 // interfaces
 import {
     ILSP25ExecuteRelayCall
-} from "../../../packages/LSP25ExecuteRelayCall/contracts/ILSP25ExecuteRelayCall.sol";
+lsp25/contracts/ILSP25ExecuteRelayCall.sol";
 
 contract BatchReentrancyRelayer {
     bytes[] private _signatures;
diff --git a/contracts/Mocks/Reentrancy/SingleReentrancyRelayer.sol b/contracts/Mocks/Reentrancy/SingleReentrancyRelayer.sol
index 27a2ffa34..02ee4c8e3 100644
--- a/contracts/Mocks/Reentrancy/SingleReentrancyRelayer.sol
+++ b/contracts/Mocks/Reentrancy/SingleReentrancyRelayer.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.4;
 // interfaces
 import {
     ILSP25ExecuteRelayCall
-} from "../../../packages/LSP25ExecuteRelayCall/contracts/ILSP25ExecuteRelayCall.sol";
+lsp25/contracts/ILSP25ExecuteRelayCall.sol";
 
 contract SingleReentrancyRelayer {
     bytes private _signature;
diff --git a/package.json b/package.json
index b07a1fa0f..5216b70af 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,8 @@
     "@erc725/smart-contracts": "^7.0.0",
     "@openzeppelin/contracts": "^4.9.2",
     "@openzeppelin/contracts-upgradeable": "^4.9.2",
-    "solidity-bytes-utils": "0.8.0"
+    "solidity-bytes-utils": "0.8.0",
+    "lsp25": "*"
   },
   "devDependencies": {
     "@b00ste/hardhat-dodoc": "^0.3.15",
diff --git a/packages/LSP25ExecuteRelayCall/.gitmodules b/packages/LSP25ExecuteRelayCall/.gitmodules
deleted file mode 100644
index 3dce69ce0..000000000
--- a/packages/LSP25ExecuteRelayCall/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "lib/forge-std"]
-	path = ../../lib/forge-std
-	url = https://github.com/foundry-rs/forge-std.git
diff --git a/packages/LSP25ExecuteRelayCall/foundry.toml b/packages/LSP25ExecuteRelayCall/foundry.toml
deleted file mode 100644
index aac84236b..000000000
--- a/packages/LSP25ExecuteRelayCall/foundry.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[profile.default]
-src = 'contracts'
-out = 'out'
-libs = ['node_modules','lib']
-cache_path = 'forge-cache'
-test = 'foundry'
-solc_version = "0.8.17"
-[fuzz]
-runs = 10_000
-max_test_rejects = 200_000
diff --git a/packages/LSP25ExecuteRelayCall/remappings.txt b/packages/LSP25ExecuteRelayCall/remappings.txt
deleted file mode 100644
index ca89288f2..000000000
--- a/packages/LSP25ExecuteRelayCall/remappings.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-@erc725/smart-contracts/=node_modules/@erc725/smart-contracts/
-@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
-@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
-eth-gas-reporter/=node_modules/eth-gas-reporter/
-forge-std/=lib/forge-std/src/
-hardhat-deploy/=node_modules/hardhat-deploy/
-hardhat/=node_modules/hardhat/
-solidity-bytes-utils/=node_modules/solidity-bytes-utils/
-ds-test/=lib/forge-std/lib/ds-test/src/
diff --git a/template/package.json b/template/package.json
index ae6c466aa..ef1238c70 100644
--- a/template/package.json
+++ b/template/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "lsp25",
+  "name": "lspN",
   "version": "0.12.1",
-  "description": "Package for the LSP25 Execute Relay Call standard",
+  "description": "Package for the LSPN <write the standard name here> standard",
   "license": "Apache-2.0",
   "author": "",
   "keywords": [
@@ -21,7 +21,6 @@
     "lint": "eslint . --ext .ts,.js",
     "lint:solidity": "solhint 'contracts/**/*.sol' && prettier --check 'contracts/**/*.sol'",
     "test": "hardhat test --no-compile tests/*.test.ts",
-    "test:foundry": "forge test --no-match-test Skip -vvv",
     "test:coverage": "hardhat coverage"
   },
   "dependencies": {