diff --git a/security/README.md b/Smart-Contract-Security/README.md
similarity index 100%
rename from security/README.md
rename to Smart-Contract-Security/README.md
diff --git a/security/hacking-address.md b/Smart-Contract-Security/hacking-address.md
similarity index 100%
rename from security/hacking-address.md
rename to Smart-Contract-Security/hacking-address.md
diff --git a/security/research-papers.md b/Smart-Contract-Security/research-papers.md
similarity index 100%
rename from security/research-papers.md
rename to Smart-Contract-Security/research-papers.md
diff --git a/erc721-solidity-101/.env_sample b/Solidity-Expert/Boilerplates/erc721-solidity-101/.env_sample
similarity index 100%
rename from erc721-solidity-101/.env_sample
rename to Solidity-Expert/Boilerplates/erc721-solidity-101/.env_sample
diff --git a/erc721-solidity-101/README.md b/Solidity-Expert/Boilerplates/erc721-solidity-101/README.md
similarity index 100%
rename from erc721-solidity-101/README.md
rename to Solidity-Expert/Boilerplates/erc721-solidity-101/README.md
diff --git a/erc721-solidity-101/contracts/MiaNFT.sol b/Solidity-Expert/Boilerplates/erc721-solidity-101/contracts/MiaNFT.sol
similarity index 100%
rename from erc721-solidity-101/contracts/MiaNFT.sol
rename to Solidity-Expert/Boilerplates/erc721-solidity-101/contracts/MiaNFT.sol
diff --git a/erc721-solidity-101/hardhat.config.js b/Solidity-Expert/Boilerplates/erc721-solidity-101/hardhat.config.js
similarity index 100%
rename from erc721-solidity-101/hardhat.config.js
rename to Solidity-Expert/Boilerplates/erc721-solidity-101/hardhat.config.js
diff --git a/erc721-solidity-101/package.json b/Solidity-Expert/Boilerplates/erc721-solidity-101/package.json
similarity index 100%
rename from erc721-solidity-101/package.json
rename to Solidity-Expert/Boilerplates/erc721-solidity-101/package.json
diff --git a/erc721-solidity-101/scripts/deploy-contract.js b/Solidity-Expert/Boilerplates/erc721-solidity-101/scripts/deploy-contract.js
similarity index 100%
rename from erc721-solidity-101/scripts/deploy-contract.js
rename to Solidity-Expert/Boilerplates/erc721-solidity-101/scripts/deploy-contract.js
diff --git a/erc721-solidity-101/scripts/mint-nft.js b/Solidity-Expert/Boilerplates/erc721-solidity-101/scripts/mint-nft.js
similarity index 100%
rename from erc721-solidity-101/scripts/mint-nft.js
rename to Solidity-Expert/Boilerplates/erc721-solidity-101/scripts/mint-nft.js
diff --git a/solidity/README.md b/Solidity-Expert/README.md
similarity index 100%
rename from solidity/README.md
rename to Solidity-Expert/README.md
diff --git a/solidity/remix-IDE.md b/Solidity-Expert/Setting-Workspace/remix-IDE.md
similarity index 100%
rename from solidity/remix-IDE.md
rename to Solidity-Expert/Setting-Workspace/remix-IDE.md
diff --git a/solidity/unit-testing.md b/Solidity-Expert/Writing-Tests/unit-testing.md
similarity index 100%
rename from solidity/unit-testing.md
rename to Solidity-Expert/Writing-Tests/unit-testing.md