diff --git a/dodoc/config.ts b/dodoc/config.ts
index 29f4f37c1..519e41575 100644
--- a/dodoc/config.ts
+++ b/dodoc/config.ts
@@ -12,7 +12,7 @@ export const dodocConfig = {
     'contracts/LSP9Vault/LSP9Vault.sol',
     'contracts/LSP11BasicSocialRecovery/LSP11BasicSocialRecovery.sol',
     'contracts/LSP14Ownable2Step/LSP14Ownable2Step.sol',
-    'packages/LSP16UniversalFactory/contracts/LSP16UniversalFactory.sol',
+    'lsp16/contracts/LSP16UniversalFactory.sol',
     'contracts/LSP17ContractExtension/LSP17Extendable.sol',
     'contracts/LSP17ContractExtension/LSP17Extension.sol',
     'contracts/LSP17Extensions/Extension4337.sol',
@@ -48,8 +48,6 @@ export const dodocConfig = {
 
     // external --------------------
     '@erc725/smart-contracts/contracts/ERC725.sol',
-    // 'solidity-bytes-utils/contracts/BytesLib.sol',
-    '@openzeppelin/contracts/token/ERC20/ERC20.sol',
   ],
   libraries: [
     'contracts/LSP1UniversalReceiver/LSP1Utils.sol',
diff --git a/package.json b/package.json
index b9ffd38fe..fb092ed97 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,8 @@
     "@openzeppelin/contracts": "^4.9.2",
     "@openzeppelin/contracts-upgradeable": "^4.9.2",
     "solidity-bytes-utils": "0.8.0",
-    "lsp25": "*"
+    "lsp25": "*",
+    "lsp16": "*"
   },
   "devDependencies": {
     "@b00ste/hardhat-dodoc": "^0.3.16",
diff --git a/tests/LSP16UniversalFactory/LSP16UniversalFactory.test.ts b/tests/LSP16UniversalFactory/LSP16UniversalFactory.test.ts
index 5f52e6984..c8ab97e6a 100644
--- a/tests/LSP16UniversalFactory/LSP16UniversalFactory.test.ts
+++ b/tests/LSP16UniversalFactory/LSP16UniversalFactory.test.ts
@@ -6,6 +6,8 @@ import {
   LSP1UniversalReceiverDelegateUP__factory,
   UniversalProfileInit,
   UniversalProfileInit__factory,
+  LSP16UniversalFactory,
+  LSP16UniversalFactory__factory,
   LSP1UniversalReceiverDelegateUP,
   UniversalProfile,
   UniversalProfile__factory,
@@ -18,11 +20,6 @@ import {
   LSP6KeyManager__factory,
 } from '../../types';
 
-import {
-  LSP16UniversalFactory,
-  LSP16UniversalFactory__factory,
-} from '../../packages/LSP16UniversalFactory/types';
-
 import web3 from 'web3';
 
 import type { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';