diff --git a/contracts/nft/EVMUniversalNFT.sol b/contracts/nft/EVMUniversalNFT.sol
deleted file mode 100644
index 08d9607d..00000000
--- a/contracts/nft/EVMUniversalNFT.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
-
-import "@zetachain/standard-contracts/contracts/nft/contracts/evm/UniversalNFT.sol";
-
-contract EVMUniversalNFT is UniversalNFT {}
diff --git a/contracts/nft/ZetaChainUniversalNFT.sol b/contracts/nft/ZetaChainUniversalNFT.sol
deleted file mode 100644
index b4a89b61..00000000
--- a/contracts/nft/ZetaChainUniversalNFT.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.26;
-
-import "@zetachain/standard-contracts/contracts/nft/contracts/zetachain/UniversalNFT.sol";
-
-contract ZetaChainUniversalNFT is UniversalNFT {}
diff --git a/hardhat.config.ts b/hardhat.config.ts
index f4ca68b1..88413b73 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -1,4 +1,3 @@
-import "@zetachain/standard-contracts/contracts/nft/tasks"
 import "@nomicfoundation/hardhat-toolbox";
 import "./packages/tasks/src";
 
diff --git a/packages/tasks/src/index.ts b/packages/tasks/src/index.ts
index 1707d328..2d7fb1f4 100644
--- a/packages/tasks/src/index.ts
+++ b/packages/tasks/src/index.ts
@@ -17,3 +17,4 @@ export { zetachainCall } from "./zetachainCall";
 export { zetachainWithdraw } from "./zetachainWithdraw";
 export { zetachainWithdrawAndCall } from "./zetachainWithdrawAndCall";
 export { newNFTTask } from "./newNFT";
+export { newTokenTask } from "./newToken";
diff --git a/packages/tasks/templates/token/contracts/nft/EVMUniversalToken.sol.hbs b/packages/tasks/templates/token/contracts/token/EVMUniversalToken.sol.hbs
similarity index 100%
rename from packages/tasks/templates/token/contracts/nft/EVMUniversalToken.sol.hbs
rename to packages/tasks/templates/token/contracts/token/EVMUniversalToken.sol.hbs
diff --git a/packages/tasks/templates/token/contracts/nft/ZetaChainUniversalToken.sol.hbs b/packages/tasks/templates/token/contracts/token/ZetaChainUniversalToken.sol.hbs
similarity index 100%
rename from packages/tasks/templates/token/contracts/nft/ZetaChainUniversalToken.sol.hbs
rename to packages/tasks/templates/token/contracts/token/ZetaChainUniversalToken.sol.hbs